Databases
StackOverflow2013
Postsdbo
POtortoisesvn svn:mergeinfo changing extra files for merges only on a single pc
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POtortoisesvn svn:mergeinfo changing extra files for merges only on a single pc
    primarykey
    data
    text
    <p>There are lots of posts with questions about why you see changes on files that include only the mergeinfo changing when performing branching and merging. They all point to one thing: svn:mergeinfo property being set on the directory or file. Examples: <a href="https://stackoverflow.com/questions/767418/remove-unnecessary-svnmergeinfo-properties">(1)</a>, <a href="https://stackoverflow.com/questions/391864/svn-mergeinfo-properties-on-paths-other-than-the-working-copy-root">(2)</a>, <a href="https://stackoverflow.com/questions/622409/tortoisesvn-using-svnmergeinfo-is-there-a-way-to-turn-it-off">(3)</a> etc.</p> <p>I have 10-15 files in our production environment where this regularly occurs. I am going to remove this property on these files. What I cannot figure out is why this behavior only occurs on my machine. We have 7 active devs branching and merging on our repository on a weekly basis and to my knowledge, only my branching and merging causes these unnecessary mergeinfo property changes to occur. </p> <p>I will remove the mergeinfo property but it won't tell me: <strong>WHY ONLY ME?!</strong> Any ideas?</p> <p>I am running TortoiseSVN 1.7.10 and VisualSVN 2.5.2 against a subversion 1.7.7 repository. </p>
    singulars
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. PTQuestion
    1. USCommunity
    1. USw00ngy
    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. POtortoisesvn svn:mergeinfo changing extra files for merges only on a single pc
      1. This table or related slice is empty.
      1. VTUpMod
    1. CODo you work on the same SVN branch as others? Maybe only yours is "affected".
      singulars
      1. POtortoisesvn svn:mergeinfo changing extra files for merges only on a single pc
      1. USbahrep
    2. COYes, I frequently work on branches with other devs. The issue occurs on any branches I do merges to/from with my PC it seems. It's happened on branches that I've created and ones that other's have created. It doesn't happen on every single merge, but I'd probably 50%.
      singulars
      1. POtortoisesvn svn:mergeinfo changing extra files for merges only on a single pc
      1. USw00ngy
 

Querying!

 
Guidance
A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.

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