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:
http://merge-tracking.open.collab.net/servlets/ProjectProcess?tab=4
A document that explains the repository can be found here:
In the above example at r14 /branches/b is merged into trunk. This
/branches/b:11-13
I believe this to be incorrect. Shouldn't it have added this:
/branches/a:4-11
branch a had previously been merged into branch b. So when branch b
The result of this property not being updated like this on trunk is
svn merge $R/branches/a
You get this:
--- Merging revision 6:
When you really should just get nothing since it has already been
M .
-- Thanks Mark Phippard http://markphip.blogspot.com/ --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org For additional commands, e-mail: dev-help@subversion.tigris.orgReceived 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.