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

AW: svn 1.3.1 merge bug

From: Thomas Börkel <TBO_at_ap-ag.com>
Date: 2006-05-19 10:18:49 CEST

HI!

On Thu, 18 May 2006, Daniel Rall wrote:

> > > When a merge brings a new file and this file is already existing,
> > > versioned and non-emtpy at the destination wc, the merge command
> > > prints "A" as status, but the file is (correctly) conflicted.
> >
> > Thomas, the problem here is that the status is "A" instead of "C"?

Correct. We are calling svn.exe from our program and are parsing the output. And in this case, the merge needs manual intervention afterwards (because of the conflict), but we don't know it, because svn.exe shows "A" instead of "C".

> > Is the content of the file from the "left" side of the merge different
> > from what's in the WC? Is the file is binary or non-binary? What
> > version of Subversion are you using?

> Oops, 1.3.1.

> My question about the file being binary is in part because what you describe sounds like a bug which was recently fixed for 1.4:

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

No, it's a simple text file.

Thomas

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri May 19 10:19:26 2006

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