On Mon, Dec 29, 2014 at 4:05 PM, Mr. User One <mr.user1_at_hotmail.com> wrote:
>
> 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.
WHY did you do it this way? You've basically lost all benefit of having a
shared repository by doing this. SVN is not a distributed system like Git
or Mercurial, and you cannot force it to act like one.
I think you best bet is to get an external merge tool like kdiff3 or Beyond
Compare (or Meld?) that can do directory comparisons. Use that to compare
the contents of your merge target to the directory on your local filesystem
you have been working out of. This will give you a list of differing files.
Now, for every one of those differing files, you will want to invoke a good
3-way merge tool. Use the branch point (release 1?) as the BASE version,
your local "branch" as one version, and the merge target as the other
version. This way you can do a merge of any changes by hand.
Then copy the merge result into a REAL working copy of your REAL repository
and commit with a descriptive comment.
Then next time, remind yourself that merging in SVN is a lot more
complicated if you don't use SVN to do the branch in the first place.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3093565
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-12-30 04:08:10 CET