CODEWITHSUNDEEP
svn
Joni H.
Joni H.

Reputation: 166

SVN merge with revision number grabs too many files

I am using SVN version 1.6 and am having a lot of issues merging using the command line. I am trying to merge a single revision (let's call it revision #5) from one branch to another.

I am merging using the command line. I am CD'ed in the branch I want to merge into, and am trying the following commands:

None of these commands seem to work properly. Each time I issue a merge command and then do an "svn status" I get a very long list of files. The list includes the files from revision #5, plus many other files that I do not want to merge.

(Note: I have been making sure that no files have been changed locally by using "svn status". I also have been reverting the changes after each merge attempt by using "svn revert . -R")

Any ideas? Thanks!

Upvotes: 3

Views: 481

Answers (1)

Jeckyhl
Jeckyhl

Reputation: 41

The long list of files displayed by "svn status" is probably due to "mergeinfo" properties updates.

As explained here when doing a merge to <target branch>, Subversion updates existing mergeinfo in all subtrees of <target branch> which have a mergeinfo property set.

This unexpected behavior has been adressed in Subversion 1.7

(from Subversion 1.7 changelog)

Merges no longer record mergeinfo (describing the merge) on subtrees (that have their own explicit mergeinfo), if the subtree was unaffected by the merge. This should greatly reduce the number of spurious svn:mergeinfo property changes for users who have large numbers of subtrees with explicit mergeinfo.

If a change being merged contains svn:mergeinfo modifications these will still be applied, just like any other property modifications. So if the change being merged was itself the result of another merge performed with a 1.5 or 1.6 client, excessive subtree mergeinfo changes are still possible. Best results will be achieved for new branches created and maintained exclusively with 1.7 clients.

Upvotes: 3

Related Questions