What am I doing wrong with SVN merging?
Posted
by randomusername
on Stack Overflow
See other posts from Stack Overflow
or by randomusername
Published on 2010-05-12T15:27:05Z
Indexed on
2010/05/12
15:34 UTC
Read the original article
Hit count: 174
When SVN with merge tracking works, it's really nice, I love it. But it keeps getting twisted up. We are using TortoiseSVN. We continuously get the following message:
Error: Reintegrate can only be used if revisions 1234 through 2345 were previously merged from /Trunk to the reintegrate source, but this is not the case
For reference, this is the method we are using:
- Create a Branch
- Develop in the branch
- Occasionally Merge a range of revisions from the Trunk to the Branch
- When branch is stable, Reintegrate a branch from the branch to the trunk
- Delete the branch
I Merge a range of revisions from the trunk to the branch (leaving the range blank, so it should be all revisions) just prior to the reintegrate operation, so the branch should be properly synced with the trunk.
Right now, the Trunk has multiple SVN merge tracking properties associated with it. Should it? Or should a Reintegrate not add any merge tracking info?
Is there something wrong with our process? This is making SVN unusable - 1 out of every 3 reintegrates forces me to dive in and hack at the merge tracking info.
© Stack Overflow or respective owner