CODEWITHSUNDEEP
svnmergefork
Cobra_Fast
Cobra_Fast

Reputation: 16111

How to merge changes to another svn repo?

I have two svn repositories containing the same project, the first one is the trunk (the main place where development takes place), the second was forked off of the master a few revisions ago and contains a slightly customized version.

Now I have made changes to the main repo and would like to merge these changes to the forked one.

What would be the most efficient way to do this?

I've tried working with svn diff and patch but I can't quite figure it out.

Upvotes: 0

Views: 144

Answers (2)

Cobra_Fast
Cobra_Fast

Reputation: 16111

cd /home/user/repo-branch
svn merge -r PREV:HEAD svn://localhost/repo/

did the trick. PREV and HEAD can also be replaced with actual revision numbers.

Upvotes: 0

Lazy Badger
Lazy Badger

Reputation: 97355

Link branch from Repo1 to any node (outside branch in question) of Repo2 (using svn:externals) and you can after it diff or even merge subtrees of single repo

Upvotes: 1

Related Questions