RE: Re: Log -g shows all revisions from source branch

Thanks Mark. Is there a document anywhere that describes the algorithm SVN uses to calculate merge history?

It looks like the self-referential mergeinfo was added to trunk as part of a merge from another branch. Not a reintegrate merge, but a two-URL merge. The origin branch had the mergeinfo that referred to trunk, and when it was merged, that mergeinfo got copied to trunk.

I had to do a two-URL merge with --ignore-ancestry instead of a reintegrate, because the branches were imported from CVS, and thus had no common ancestor. The --ignore-ancestry option doesn't work with reintegrate merges.

Does this make sense? Are two-URL merges known to cause problems with mergeinfo? If so, what would have been a better choice?

Thanks,
Jacob

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2428914

Please start new threads on the <users_at_subversion.apache.org> mailing list.
To subscribe to the new list, send an empty e-mail to <users-subscribe_at_subversion.apache.org>.
Received on 2009-12-09 17:58:04 CET