[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: PLEASE HELP...Merging files with a changed property

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-06-16 21:51:27 CEST

On Jun 16, 2005, at 2:25 PM, Jean-Luc Wasmer wrote:

> Hi,
>
> I'm rephrasing my problem since I didn't get any answer to my
> original post.
>
> When I merge two branches which only difference is the value of the
> svn:eol-style property for a couple of files, I get a working copy
> that I can't commit: Subversion shows the 'U' flag during the merge
> but a "svn status" on the working copy returns nothing (no
> modification) and "svn propget svn:eol-style" on the specific files
> returns the old value.
>
> Am I doing something wrong here?

What do you mean by "a working copy that I can't commit"? Why can't
you commit?

Perhaps you're seeing a ' U' for the propchange, but that the merge
is clean -- that is, the value already exists in the working copy...?

Can you send us a script that demonstrates the problem?

Also, might it be this bug?

    http://subversion.tigris.org/issues/show_bug.cgi?id=2035

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 16 21:57:09 2005

This is an archived mail posted to the Subversion Users mailing list.