svn merge lies?

["Reedick, Andrew" <An...@BellSouth.com>]

Has anyone seen a case where 'svn merge' lists a bunch of files as 'A'
or 'U' during the merge, but actually does a merge conflict 'C' instead?


The 'svn merge' output says "A" or "U", but 'svn status' lists them as
'C' and they do have merge conflict files (left, right, working.)  This
affected both text and binary files.  In my case, the text output from
'svn merge' listed 61 conflicts, but actually generated 254 conflicts.
Which was a rude shock since we were working off of the 61 conflict
list.

This was in a clean, newly created workspace.  This was a real 'svn
merge' and NOT a --dry-run (I'm already aware of how --dry-run
under-reports.)

It looks like I'm not the first person to see this behavior, but there
was no resolution:
	
http://subversion.tigris.org/servlets/ReadMsg?listName=users&msgNo=36801


This is with Subversion 1.3.0, in a clean workspace.  

*****

The information transmitted is intended only for the person or entity to which it is addressed and may contain confidential, proprietary, and/or privileged material. Any review, retransmission, dissemination or other use of, or taking of any action in reliance upon this information by persons or entities other than the intended recipient is prohibited. If you received this in error, please contact the sender and delete the material from all computers. 117


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: svn merge lies?

[Garrett Rooney <ro...@electricjellyfish.net>]

On 7/11/06, Reedick, Andrew <An...@bellsouth.com> wrote:
> Has anyone seen a case where 'svn merge' lists a bunch of files as 'A'
> or 'U' during the merge, but actually does a merge conflict 'C' instead?
>
>
> The 'svn merge' output says "A" or "U", but 'svn status' lists them as
> 'C' and they do have merge conflict files (left, right, working.)  This
> affected both text and binary files.  In my case, the text output from
> 'svn merge' listed 61 conflicts, but actually generated 254 conflicts.
> Which was a rude shock since we were working off of the 61 conflict
> list.
>
> This was in a clean, newly created workspace.  This was a real 'svn
> merge' and NOT a --dry-run (I'm already aware of how --dry-run
> under-reports.)
>
> It looks like I'm not the first person to see this behavior, but there
> was no resolution:
>
> http://subversion.tigris.org/servlets/ReadMsg?listName=users&msgNo=36801
>
>
> This is with Subversion 1.3.0, in a clean workspace.

This has been "fixed" (i.e. we now report C, not A, which isn't ideal,
you'd like to have both bits of info, but still, better than nothing)
and will be in the first 1.4.x release.

-garrett

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org