I have tried to use the tortoise merge to no avail.
I have X/trunk/foo (/bar, /beer) at revision 10
I branch to X/branches/yofi/foo at 11
trunk progresses to 99
branch/yofi progresses to 100
I now want to merge the 'foo/bar' branch back to the trunk.
I know that theoretically I need to
svn merge -r11:head X/branches/yofi/foo/bar X/trunk/foo/bar
the merge will take the delta between r11 to head on the foo/bar branch and
merge the changes with the trunk.
both are working copies...
How do I do this with Tortoise? Where do I have to be when I click?
trunk/foo/bar?
What do I put in the branch field? branch/yofi/foo/bar?
What do I put in the [from & to]? [11 & head]?
It does not work :-(
I get the following message:
Invalid editor anchoring; at least one of the input paths is not a directory
and there was no source entry.
Help!
Amir Kolsky
XP& Software
Received on Wed Jul 21 17:23:53 2004