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

Bizarre merge bug

From: Max Bowsher <maxb_at_ukf.net>
Date: 2004-07-14 15:48:36 CEST

Reproduction script:

#!/bin/bash
rs=http://svn.collab.net/repos/svn
svn co -r 10284 $rs/branches/1.0.x/packages/rpm/wbel-3 tmp-1.0.x
svn di -r 10175:10176 $rs/trunk/packages/rpm/wbel-3
svn merge -r 10175:10176 $rs/trunk/packages/rpm/wbel-3 tmp-1.0.x
svn di tmp-1.0.x

Observation:

The first diff, direct from the repository, is correct.

The second diff, showing the result of the merge, is wrong - it contains
this fragment:

+<<<<<<< .working
+=======
+* Wed Jul 07 2004 David Summers <david@summersoft.fay.ar.us> 1.1.0-10174
+- Require neon-0.24.7 to fix invalid XML (compression) bug.
+
+* Wed May 05 2004 David Summers <david@summersoft.fay.ar.us> 1.1.0-9628
+- Track changes to perl binding compile and install.
+- Locale files now installed.
+
+>>>>>>> .merge-right.r10176

The second changelog entry *was not added in r10176* !!!

First thoughts: it appears we are basing the second chunk in the conflict
display too much upon the actual content of .merge-right, when it would be
more intuitive to base it on the diff between .merge-left and .merge-right .

Max.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 14 15:49:55 2004

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