[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: Jean-Luc Wasmer <jl+subversion_at_lists.wasmer.ca>
Date: 2005-06-16 22:44:28 CEST

Ben Collins-Sussman wrote:

>> 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.
>
>
> What do you mean by "a working copy that I can't commit"? Why can't
> you commit?

because SVN thinks the WC is clean: "a "svn status" on the working copy
returns nothing"

> 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...?

No, the value is different. The value used to be "native"... then I
changed that for "LF" in the trunk. After merging the trunk to the
branch, I see the 'U' as expected but the merge should not be clean.

> Can you send us a script that demonstrates the problem?

svnadmin create --fs-type bdb rep
mkdir wc
mkdir wc/trunk wc/branches
touch wc/trunk/file
svn import wc file:///`pwd`/rep -m "Import"
rm -rf wc
svn co file:///`pwd`/rep/trunk
svn propset svn:eol-style native trunk/file
svn commit trunk -m "Setting EOL property to native"
svn copy file:///`pwd`/rep/trunk file:///`pwd`/rep/branches/branch1 -m
"Branching branch1"
svn propset svn:eol-style LF trunk/file
svn commit trunk -m "Changing EOL property to LF"
svn co file:///`pwd`/rep/branches/branch1

up to here, everything is OK

svn propget svn:eol-style trunk/file
svn propget svn:eol-style branch1/file
svn merge trunk@HEAD branch1@HEAD branch1
svn propget svn:eol-style trunk/file
svn propget svn:eol-style branch1/file

> Also, might it be this bug?
>
> http://subversion.tigris.org/issues/show_bug.cgi?id=2035

I'm not sure.... looks like something else.

JL

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Jun 16 22:46:19 2005

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