Geek Answers Handbook

How to merge between branches branched from different versions of the trunk?

Our team uses Eclipse to develop a software product, and recently we have switched to Subversion for source / version control. At first, our team still made direct contact with the trunk, as we were new to Subversion for source control, and all that needed to be done.

At some point, I made my first real branch from the trunk to do development for a specific project inside our product. Suppose the branch is called DEV_PROJ.

Later, when our team knew how to work with Subversion from Eclipse, I put the team in our first branch of real development, not for a specific subproject, but to track different versions. Suppose the branch is called DEV_VERS. Now we are working on this branch and no longer commit directly to the trunk. DEV_VERS was forked with the latest torso, and since then there have been no commits in the torso.

About two / three months passed between the two branches, and there were many changes in the trunk before I made the version branch. Now it's time to merge the changes with DEV_PROJ into the DEV_VERS branch to include the project in our new branch.

What I did first was to merge the latest version of trunk with my DEV_PROJ branch (forward merge?), Believing that this would minimize the difference between the two branches, preserving project-specific changes.

What I'm trying to do now and that I am having problems is merging DEV_PROJ with the DEV_VERS branch. Right-click the command / Combine my project DEV_VERS to start the merge, there are three tabs to choose from: URL, 2 URL, Reintegrate. As far as I know, this is not a reintegration association, it would be from branch to trunk, and not between branches that are not directly connected. I also do not need to merge the two branches towards my branch, so I skip 2 tabs of the URL.

, , URL. DEV_PROJ, : , : . Ignore Ancestry. " ", , .

, , , DEV_PROJ. , (subversion) , . , DEV_PROJ, "", , , , , "" " " .

:

  • ? , , (URL, 2URL, Reintegrate)?
  • ( DEV_PROJ), , ?
  • , . DEV_PROJ (), DEV_VERS ( ). ? , ?

Eclipse: Helios Service Release 2, : 20110218-0911
SVN: 1.6.15
Eclipse SVN: SVNKit 1.3.2 (2.2.2.I20100512-1900)//SVN Connector (2.2.2.I20100512-1900)// SVN (0.7.9.I20100512-1900)

+5
1

, :

        _________________ B        DEV_PROJ
       / 
    A /
---------------------------------- trunk
             C \
                \_____________ D   DEV_VERS

A -> B DEV_VERS.

, ( , GUI Eclipse SVN):

  • A:

    • svn log --stop-on-copy URL_OF_DEV_PROJ
    • - A

  • B:

    • , all DEV_PROJ, B HEAD

  • DEV_VERS:

    • svn co URL_OF_DEV_VERS

  • 3 A B :

    • svn merge -r<RevisionOfA>:HEAD URL_OF_DEV_PROJ .

, A B DEV_VERS

+6

More articles:


All Articles