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

Re: svn merge lies?

From: Garrett Rooney <rooneg_at_electricjellyfish.net>
Date: 2006-07-11 21:37:49 CEST

On 7/11/06, Reedick, Andrew <Andrew.Reedick@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.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jul 11 21:38:59 2006

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