On Sun, Nov 29, 2009 at 10:59:28PM +0100, Andreas Krey wrote:
> [Serious question here:]
>
> For example: If I notice that the trunk actually developped
> in a direction that should be on a branch, and I do like
>
> svn mv trunk branch/newfeature
> svn cp trunk_at_12345 trunk
>
> (with 12345 being the last 'good' revision), and assuming that there
> are no merges from or to trunk since 12345, will the mergeinfo between
> trunk and the other branches in existence still do the right thing?
That should be fine, the mergeinfo will reflect what happened.
It should work even if you drop the requirement that no merges
involving trunk were done since r12345.
The new trunk will have the exact same mergeinfo as trunk_at_12345 has.
The branch at branch/newfeature will contain revisions merged to
its former location at /trunk as part of its "natural history",
it won't try to soak up /trunk:12345-{HEAD-1} again.
You would possibly need to merge into the new trunk some revisions
between r12345 and HEAD. The new trunk is missing any revisions between
r12345 and HEAD, so you would replay parts of the missing bit of history
as needed. Think about what commits you would have made into trunk if
branch/newfeature had been a branch of trunk_at_12345 in the first place.
Those may need to be done again.
Another approach to solving this problem might be copying trunk_at_12345
to branch/newfeature, merging revisions belonging to the feature from
trunk into branch/newfeature, reverse-merging (i.e. undoing) those
revisions on trunk itself, and then blocking those new "undo" revisions
from entering the branch by merging them into the branch as --record-only.
Later you can use your friend --reintegrate to merge branch/newfeature
back into trunk, once the feature is really done.
Stefan
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2425311
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-11-30 00:11:29 CET