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

Re: diff3 and adjacent changes at the end of a file

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2005-11-10 01:36:01 CET

"Marc Strapetz" <marc.strapetz@smartsvn.com> writes:

> When "merging" (diff3) two files with adjacent changes at the end of a file,
> SVN produces a conflict which I would not expect. To reproduce this, I have
> set up following test case (for which I can also supply corresponding
> repository and working copy, if helpful):

If you run 'make diff3' you can then use tools/diff/diff3 to see how
Subversion would merge files without the need to create a repository
and working copy. (For two way diffs use 'make diff' and
tools/diff/diff respectively.)

Philip Martin
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Nov 10 01:36:32 2005

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