CODEWITHSUNDEEP
svnmerge
Kricket
Kricket

Reputation: 4179

Subversion: mark as merged without changing anything

We have a large project in SVN, including code and a sub-module for documentation.

When merging between the different versions, naturally the code changes need to be merged. But, the eligible revisions also always contain the docs as being eligible for merging. This is annoying, as changes to the docs can't really be "merged" the same was as code - changes to the docs are done manually on the different branches.

Is there a way to have SVN mark the docs as having been merged, without actually changing the content of any files?

Upvotes: 1

Views: 3884

Answers (1)

Álvaro González
Álvaro González

Reputation: 146390

That's what the --record-only flag is meant for:

--record-only

Enables a special mode of svn merge in which the specified merge operation is recorded in the local merge tracking information, but is not actually performed.

Upvotes: 2

Related Questions