Been using SVN branches with Tortoise 1.6. I've been periodically merging the trunk into the branch to keep it up to date.
Today, I thought I'd reintegrate the branch. I chose "Reintegrate a branch" from Tortoise and received the following error message:
Reintegrate can only be used if revisions 4709 through 5019 were previously merged from
http://subversion/svn/saxdev/trunk to the reintegrate source, but this is not the case
It then listed around 50 files with descriptions such as this:
Error: Missing ranges: /trunk/kobalt/sax/businessobjects/util/HistoryParent.java:4709-5018
Revision 5019 is the head revision.
Revision 4737 was the revision when I created a branch.
I have this from the log for revision 4737
Action: Added Path: /branches/qst Copy from path: /trunk
To me, that error message says that the branch was not originally from trunk, which isn't true.