I didn't see this in the FAQ or the issue tracker, but I'm not on the
mailing list, so apologies if this is a duplicate.
Currently, during a merge, the 1.2 version of TortiseSVN will helpfully
subtract one from whatever version you choose in the log screen, so that you
get the revision which is included in that log message. However, if you
select the revision which created the branch you are merging from,
Subversion generates an error when you try to do the merge. As far as I can
tell, TortoiseSVN is subtracting one from the revision I choose (the branch
point) and then looking for that revision in the branch I've selected.
However, the branch didn't exist at that point, so Subversion generates an
error:
Error: REPORT request failed on
'/svn/OMS/!svn/bc/34/users/swiedlce/CR%201269'
Error: '/svn/OMS/!svn/bc/34/users/swiedlce/CR%201269' path not found
In this case I selected revision 35, which was the revision where I
branched "CR 1269". I'm now trying to merge that branch back into the trunk.
I think that when a user creates a branch, they can't make any other
changes (unless maybe they branched from a working copy?) so would it make
sense to use the actual revision the user selects (rather than the one
before) if they select a branch point? Is there any case where subtracting
one from a branch point revision will do something useful?
Thanks, by the way, for the excellent product. It's helped me move our
group off that gawdawful SourceSafe.
chris
Received on Sat Jun 11 08:48:25 2005