CODEWITHSUNDEEP
svnbranch
Will
Will

Reputation: 924

SVN Merge not finding my changes

Here is the command I'm issuing:

svn merge -r74:80 http://url.to/svn/branch/branch_name

It will think for a minute, then return a blank prompt like there's no differences between the two. I know for a fact that there are differences between the branch and trunk.

What am I doing wrong? :(

Upvotes: 0

Views: 973

Answers (1)

Christopher Creutzig
Christopher Creutzig

Reputation: 8774

Your command asks svn to merge the differences between revisions 74 and 80 inside the branch into your working copy. Does

svn diff -r74:80 http://url.to/svn/branch/branch_name

show any changes to that branch in these revisions?

Edit: svn merge gets two points in repository space-time, takes their difference and tries to merge that difference into your working copy. If you want to merge changes from trunk to a branch, you will need to check out that branch and make a merge à la 

svn merge -r74:80 http://url.to/svn/trunk

or

svn merge http://url.to/svn/trunk http://url.to/svn/branch/branch_name .

while standing in that directory. Then, resolve conflicts, test(!) and svn ci.

Why does svn work this way? To give you a chance to resolve conflicts and test before you submit changes to the repository.

Upvotes: 1

Related Questions