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

Possible bug in merge tracking

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-06-03 17:38:09 CEST

A repository dump file can be obtained here:


A document that explains the repository can be found here:


In the above example at r14 /branches/b is merged into trunk. This
adds the following to the mergeinfo property value:


I believe this to be incorrect. Shouldn't it have added this:


branch a had previously been merged into branch b. So when branch b
was merged into trunk it got the changes from both a and b. It seems
like the change to the mergeinfo property of branch b should have been
merged into the property on trunk, and that would bring along this

The result of this property not being updated like this on trunk is
that if you run this command from a trunk WC:

svn merge $R/branches/a

You get this:

--- Merging revision 6:
--- Merging revisions 8-17:
A products/roadmap.html

When you really should just get nothing since it has already been
merged. In the above case, that file is not really added. svn st
after running this command just reports:

 M .

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Jun 3 17:38:21 2007

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

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