Ignoring ancestry in --reintegrate merge
From: Jacob Weber <jacob_at_jacobweber.com>
Date: Tue, 7 Jul 2009 17:59:31 -0700 (PDT)
I thought --reintegrate was basically like a diff, in that ignored ancestry. But this doesn't seem to be the case; it recognizes when files were deleted and re-created in the same place, and shows them as a conflict. Is there a way to avoid this?
Here's my situation. I had a project in CVS, which I converted to Subversion using cvs2svn. It has a trunk and a branch. All changes from the trunk have been merged into the branch before the conversion.
I wanted to set up the branch's mergeinfo property, so that Subversion knew that the trunk was already merged into it. So I did this:
But when I try to reintegrate the branch back into the trunk, something strange happens. I start seeing lots of "R"eplaced files -- files that were deleted and re-created.
I think this happens because of the following sequence of events:
So, is there a way for me to tell Subversion to ignore the files' ancestry when doing a --reintegrate merge?
------------------------------------------------------
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
|
This is an archived mail posted to the Subversion Users mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.