StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<blockquote> <p>But why only these 80 files?</p> </blockquote> <p>These files have a <code>svn:mergeinfo</code> property; the others don't. When individual files and project subfolders have this, it is called "subtree mergeinfo". Once a file or folder has a "svn:mergeinfo" property, the mergeinfo will be updated on each merge operation.</p> <p>If you merge only on the root of your project, and use the latest version of the SVN client, you will rarely see subtree mergeinfo. Only the root folder of the project branches (e.g. <code>/trunk</code>, <code>/branches/foo</code>) should have a <code>svn:mergeinfo</code> property.</p> <p><strong>edit</strong>: If you simply delete the subtree mergeinfo, then subversion doesn't know that the merge happened. As a consquence, subversion might try to merge these revisions again whenever let it pick the revisions eligible for merging automatically (e.g. when you do a <code>svn merge</code> without specififying the <code>-r</code> or <code>-c</code> options). In the worst case such a merge attempt might generate some spurious conflicts, which is not a big problem; just resolve them manually.</p> <p><strong>update</strong>: Subversion 1.7 now only updates mergeinfo when it is necessary. From the <a href="http://subversion.apache.org/docs/release-notes/1.7.html#subtree-mergeinfo-recording" rel="noreferrer">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 svn:mergeinfo property changes for users who have large numbers of subtrees with explicit mergeinfo. </p> </blockquote>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

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