Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <h3>SVN 1.7 and later</h3> <p>This should be fixed in SVN 1.7. From <a href="http://subversion.apache.org/docs/release-notes/1.7.html#subtree-mergeinfo-recording" rel="nofollow noreferrer">the release notes</a>:</p> <blockquote> <p>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 <code>svn:mergeinfo</code> property changes for users who have large numbers of subtrees with explicit mergeinfo.</p> </blockquote> <h3>SVN prior to 1.7</h3> <p>What happens is that once a file/folder has explicit mergeinfo, each subsequent merge to the branch will update that mergeinfo even if the file/folder is unrelated. This is annoying as it introduces more and more clutter in the changelist for each merge.</p> <p>To avoid this, only merge to the "root" folder of the branch, for example "/branches/maintenance2.x". None of the files or folders below "/branches/maintenance2.x" should then get mergeinfo. Follow the <a href="http://svnbook.red-bean.com/en/1.5/svn.branchmerge.advanced.html#svn.branchmerge.advanced.finalword" rel="nofollow noreferrer">merging advice in the SVN book</a>.</p> <p>Unfortunately, even if you merge only at the "root" folder of the branch, empty <code>svn:mergeinfo</code> properties can still appear on individual files and folders when they are copied, to indicate that they have not received the same merges as their siblings.</p> <p>It is probably safe to delete the superfluous subtree mergeinfo. One way to do this is by doing a recursive deletion of the <code>svn:mergeinfo</code> property on each file and folder in your project root. (But keep the mergeinfo on the root folder itself!)</p> <p>Alternatively, you can upgrade to <a href="http://www.open.collab.net/downloads/subversion/" rel="nofollow noreferrer">Subversion 1.6</a>. I have verified that it fixes this issue. It even seems to delete superfluous mergeinfo added by earlier versions for you.</p> <p>Judging from the comments there are still cases in SVN 1.6 where superfluous sub-tree mergeinfo appears. But I have not been able to reproduce that.</p>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
    3. VO
      singulars
      1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload