CODEWITHSUNDEEP
svnmerge
Paul Kersey
Paul Kersey

Reputation: 447

SVN merge an already merged branch to trunk

Using a command line version of SVN (SlikSvn), I have a branch Ive been working on for a while, and merged it into trunk as I thought I had finished with that branch.

But now, Ive done more work on the branch, and committed a number of new revisions (to the branch). The trunk has not had any modifications since the branch was merged.

What I want to do now, is get my recent branch changes into trunk, and Im unsure if I should merge from the revision number where this branch started again, or from the revision where I last merged, or the one after... or maybe something else.

Very many thanks.

Upvotes: 1

Views: 1778

Answers (2)

JW.
JW.

Reputation: 51638

Did you use merge --reintegrate when merging to trunk? That's the right way to do it. If so, you can continue working in the branch. But you need to block the merge from being re-merged into your branch. See this answer.

Upvotes: 2

khmarbaise
khmarbaise

Reputation: 97359

Just go into trunk working copy do

   svn merge URL/branchname

that's it.

Or in TortoiseSVN default merge revision range.

Upvotes: 1

Related Questions