merging advice request

Hi, please give me some advice on this svn merging issue (TortoiseSVN 1.8.4, Build 24972 - 64 Bit)

There is a project in a shared svn repo, with a trunk and release branches in it. Every time a new release is about to be ready, a new branch is created to stabilize the release.

My version of the project is based on a release branch, but it is not really branched off. Instead I created a local repo started off from a local working copy of a release branch. Then I applied a couple of dozens of patches to customize it, and committed one by one to this local repo.

Now it is time to sync up with the next release.

--trunk--------------------------------
         \ \
          -- release 1 -- release 2
            : |
             : |
             -- my repo ----+?
                         
Trial 1
=======
cd <my repo's working copy>
svn merge --dry-run <release1 repo> <release 2 repo> .
Result:
Fails on the first folder found new in release 2.
svn: E155010: The node <folder new in release 2 repo (not present in release 1, neither in my repo)> was not found.

Trial 2
=======
cd <working copy of release2>
svn merge --dry-run <release1 repo> <my local repo> .
Fails with svn: E195012: '<repo release1>' must be from the same repository as '<my local repo>'

Please explain how I could do the sync-up!

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3093562

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-12-30 01:21:06 CET