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

Re: Bug in merge (repro included)

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2005-02-02 17:34:12 CET

On Feb 2, 2005, at 9:07 AM, Thomas Börkel wrote:
> The code in the trunk looks slightly different there, so IMHO the merge
> should result in a conflict (trying with GNU patch results in a
> failure).
> But it doesn't. After the merge, the new block has just been added
> without
> conflict and the old block has not been removed.

GNU diff and patch is doing only a 2-way diff, but 'svn merge' is doing
a 3-way comparison. What does GNU diff3 do with the 3 files?

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Feb 2 17:37:19 2005

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.