You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Jean-Luc Wasmer <jl...@lists.wasmer.ca> on 2005/06/16 19:25:38 UTC
PLEASE HELP...Merging files with a changed property
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?
JL
(I use Subversion 1.2)
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: PLEASE HELP...Merging files with a changed property
Posted by Jean-Luc Wasmer <jl...@lists.wasmer.ca>.
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
Re: PLEASE HELP...Merging files with a changed property
Posted by Ben Collins-Sussman <su...@collab.net>.
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
Re: PLEASE HELP...Merging files with a changed property
Posted by Jean-Luc Wasmer <jl...@lists.wasmer.ca>.
kfogel@collab.net wrote:
>Jean-Luc Wasmer <jl...@lists.wasmer.ca> writes:
>
>
>>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?
>>
>>(I use Subversion 1.2)
>>
>>
>
>Heh, I'll bet I know what's happening. The client "normalizes" the
>values of certain svn: properties. For example, one person might set
>this:
>
> svn:eol-style ==> "NATIVE"
>
>And another might set it to:
>
> svn:eol-style ==> "Native"
>
>And a third might set it to:
>
> svn:eol-style ==> "native"
>
>Subversion normalizes them all to the third way, I think: "native".
>
>
well in my case, svn merge normalizes "LF" to "native" :-)
JL
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: PLEASE HELP...Merging files with a changed property
Posted by kf...@collab.net.
Jean-Luc Wasmer <jl...@lists.wasmer.ca> writes:
> 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?
>
> (I use Subversion 1.2)
Heh, I'll bet I know what's happening. The client "normalizes" the
values of certain svn: properties. For example, one person might set
this:
svn:eol-style ==> "NATIVE"
And another might set it to:
svn:eol-style ==> "Native"
And a third might set it to:
svn:eol-style ==> "native"
Subversion normalizes them all to the third way, I think: "native".
Similar things happen with a few other properties.
Could that be what's going on here? Can you inspect the relevant
revisions of the properties to see?
Thanks,
-Karl
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org