I have two repositories which live on separate servers, call them repo-1 and repo-2.
To start both "trunks" were equal:
repo-1/trunk == repo-2/trunk
Meanwhile changes were being commited to repo-1/trunk and I was working on and commiting changes to repo-2/trunk.
Now I need to merge changes from repo-1/trunk into repo-2/trunk.
I thought I would copy repo-1/trunk into repo-2/tags/r1_20090224, then merge that tag into my local working copy of repo-2/trunk (i.e. c:\dev\repo2-trunk).
Any suggestions on how to do this? I'm trying to use TortoiseSVN and performing "Merge two different trees", I used the following settings:
From: repo-2/trunk To: repo-2/tags/r1_20090224 Working Copy: c:\dev\repo2-trunk
I also tried swapping the "from" and "to"...but no luck. By trying either of those two merge options I either end up with the following outcome:
If I merge from trunk to tag (into my local copy of repo-2/trunk) I lose my trunk changes and get the tag changes.
If I merge from tag to trunk (into my local copy of repo-2/trunk) I lose my tag changes and keep my trunk changes.
Any suggestions on to do this??