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

Re: svn merge produced conflict with bad merge

From: Max Bowsher <maxb_at_ukf.net>
Date: 2004-08-11 21:49:48 CEST

Kevin Ballard wrote:
> On Aug 11, 2004, at 3:14 PM, Ben Collins-Sussman wrote:
>
>> An interesting experiment would be for Kevin to repeat the update using
>> '-diff3-cmd' argument: see if GNU diff3 gives significantly different
>> results.
>
> Ok, I just did. And the built-in /usr/bin/diff3 worked perfectly. No
> conflicts.

Is there more context beyond what you are showing us?

I took the left, right, and working versions you quoted in your previous
mail, and had subversion perform a merge, and it did so without conflict,
and correctly.

Max.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Aug 11 21:50:34 2004

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