I'm experiencing the following reintegrate error when trying to move a
feature branch back to trunk. (this is the output from TortoiseSVN):
Error: Reintegrate can only be used if revisions 320 through 364 were
previously
Error: merged from svn://server/project/trunk to the reintegrate source, but
Error: this is not the case:
Error: branches/DEV_BRANCH/folder1
Error: Missing ranges: /trunk/folder1:320-361
Error: branches/branchname/folder2
Error: Missing ranges: /trunk/folder2:320-361
I've removed identifying information because of company policy, but the
names here indicate where I am in the repository. I'm trying to reintegrate
DEV_BRANCH to trunk.
I've found references here:
http://svn.haxx.se/users/archive-2009-03/0136.shtml
where Mark Phippard suggested using the record-only option to fix the
mergeinfo on DEV_BRANCH. I attempted to merge R320-361 from trunk to my dev
branch and recommit (this created R362). I can see the updated mergeinfo.
However, the reintegrate merge still fails in the same way, with TSVN now
complaining about R320-362 in folder1 and folder2.
The entire project at branchname and below was copied from trunk at R319,
and I merged "all revisions" from trunk to my "branchname" branch at three
different times to keep my branch in sync with trunk. Those merges were (I
thought at the time) successful. There were no errors and no unexpected
merge conflicts of any kind.
I have not moved, renamed or merged any subtrees under my branchname folder.
I've done what was posted here: http://blog.red-bean.com/sussman/?p=92 using
TortoiseSVN exclusively. When using SVN 1.5.x I never had a blip;
merge-tracking worked spot-on unless I did something that I could easily
identify as wrong.
I have to believe that I'm doing something wrong here too, but I don't know
what it is or how to repair the situation. Can anyone point me toward a
good source or offer any advice? Thanks! Erik
------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=2391036
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-09-04 17:28:40 CEST