CODEWITHSUNDEEP
svnmergesvn-reintegrate
Abhijeet Pawar
Abhijeet Pawar

Reputation: 682

How t reintegarte branch of branch in svn

I am using SVN. I have a branch created from another branch which in turn created from trunk. Now what is the correct procedure to rentegrate my branch to trunk?

-------------------------------------------- trunk
   \
    \________________________ Branch1
              \
               \____________ MyBranch

Upvotes: 2

Views: 126

Answers (2)

Diego Fernández Durán
Diego Fernández Durán

Reputation: 2682

Merge back MyBranch to Branch1 and then Branch1 back to trunk, or reintegrate MyBranch to Branch1 and then Branch1 to trunk. I'm not a fan of --reintegrate, I prefer manual just merge the right revisions.

----(1)-------------------------------------- trunk    \
     \(2)_____(3)______________ Branch1
               \
                \(4)__________(5) MyBranch

Or, if you want go the hard way: merge from Branch1 to trunk the revisions from Branch1 creation to the Branch1's revision from where you created MyBranch, and then merge MyBranch to trunk.

If you know that there's no changes between (4) and (5) that depends in changes between (2) and (3) you can just merge MyBranch directly to trunk.

Upvotes: 0

Lazy Badger
Lazy Badger

Reputation: 97282

Mybranch and Branch1 both use the same method of reintegration: standard. Starting point of branch is unimportant

Upvotes: 1

Related Questions