0

I wanted to work on a small set of changes independent from my other development on a project. I've been using this as a guide.

I started off by doing a svn cp from /trunk/app/module to /branches/pete/feature-branch, this was r393

After some changes, and merges from back and forth between the trunk and branch to keep things up to date, I was finished with my feature, and went back to working on the trunk.

A couple few revisions later, I decided maybe I should clean up my feature branch so I tried to reintegrate it.

  1. I checked out a fresh copy of the feature branch and trunk.
  2. I merged the trunk changes into the feature branch and committed them
  3. I then did a merge --reintegrate ^/branches/pete/feature-branch on the trunk resulting in r434

Everything looks OK from the code point of view, but now my trunk/app/module still has a svn:mergeinfo property.

$ svn pg svn:mergeinfo
/branches/pete/feature-branch:393-433

From what I understand, svn:mergeinfo should be empty and these revisions should be "elided" or is this OK?

Pete
  • 1,305
  • 1
  • 12
  • 36
  • Why do you want to remove these information? It shouldn´t effect you anyway – royalTS Mar 07 '18 at 09:44
  • On which folder level did you apply the SVN merge command? Can you paste the complete command (and path) you used for merging? – Peter Parker Mar 07 '18 at 16:16
  • @royalTS I wasn't sure if it was supposed to be there. How I interpreted to the doc i was reading, it shouldn't be, and I was afraid it might affect branching/merging in the future. – Pete Mar 07 '18 at 17:15
  • @PeterParker from the /trunk/app/module directory, I called `svn merge --reintegrate ^/branches/pete/feature-branch`, then a `svn ci` and then `svn delete ^/branches/pete/feature-branch` – Pete Mar 07 '18 at 17:19

1 Answers1

1

This information on the subfolder shows you that you (accidentally?) merged on a subfolder (not on trunk, but on /trunk/app/module).

Subversion knows now that it will not merge these revisions from this branch again. Usually you should only merge on the topmost folder, so the mergeinfo is only on this folder.

To merge only a subdirectory is not recommended by SVN-Team (See SVN book topic here)

Avoid subtree merges and subtree mergeinfo. Perform merges only on the root of your branches, not on subdirectories or files (see the section called “Subtree Merges and Subtree Mergeinfo”) .

Still all merges are possible, but you end up with a lot of (different) mergeinfos on different folderlevels, which makes it later harder to figure out what is going on and why SVN behaves this way.

Also it is always possible (not recommended!) to delete the merge-info property, to "reset" the mergetracking feature. Mostly done by also deleting the branch as well. Then the risk of a second merge is usually negligible.

Peter Parker
  • 29,093
  • 5
  • 52
  • 80
  • So if I understand you correctly, I should have made branches/pete/feature-branch a copy of /trunk, not /trunk/app/module? – Pete Mar 07 '18 at 17:27
  • yes, exactly.... otherwise SVN needs to keep track of different path's merge-info by applying the merge-info property to these paths. – Peter Parker Mar 08 '18 at 09:33