Bogus mergeinfo from a 3-way merge?
From: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2007-12-06 14:51:14 CET
I think our mergeinfo-less 3-way merge code has a minor bug in that it
Let's take an example:
$ svn merge ^/branches/1@HEAD ^/branches/2@HEAD trunk
Now, if ^/branches/1@HEAD has no mergeinfo, but ^/branches/2@HEAD *does*,
Can we actually claim at this point that trunk has had merged into it all
If it is *not* universally true, then I would recommend that for
-- C. Michael Pilato <firstname.lastname@example.org> CollabNet <> www.collab.net <> Distributed Development On Demand
This is an archived mail posted to the Subversion Dev mailing list.