Databases
StackOverflow2013
Postsdbo
POGit-SVN with svn.pushmergeinfo: how to avoid self-referencing mergeinfo lines
Body
 

Note that there are some explanatory texts on larger screens.

plurals
  1. POGit-SVN with svn.pushmergeinfo: how to avoid self-referencing mergeinfo lines
    text
    copied!<p>In recent versions of git, the configuration <code>svn.pushmergeinfo</code> was introduced:</p> <blockquote> <p>config key: svn.pushmergeinfo</p> <p>This option will cause git-svn to attempt to automatically populate the svn:mergeinfo property in the SVN repository when possible. Currently, this can only be done when dcommitting non-fast-forward merges where all parents but the first have already been pushed into SVN.</p> </blockquote> <p>We're using this to have a mixed environment where some developers use SVN and some use Git-SVN. This works great when branching and merging SVN-branches in Git and then <code>git svn dcommit</code>-ing back to SVN, and it actually correctly populates the mergeinfo property in almost all cases. However, in specific situations it does so incorrectly. </p> <p>This happens mainly when merging a branch into master (trunk), after having merged trunk into that branch (effectively, the equivalent of a SVN reintegrate). </p> <p>The merge from trunk to the branch adds a mergeinfo line for trunk on that branch (as desired), but the reintegrate-merge from the branch back to trunk copies that line into trunk's mergeinfo, effectively creating a self-referencing line in trunk's mergeinfo property that points to itself. As far as I know this self-reference should never happen, and doesn't happen when using SVN alone. So, I consider this a git-svn bug (which I've reported <a href="http://thread.gmane.org/gmane.comp.version-control.git/191932">here</a>). This in turn creates problems down the road which affect other SVN users and corrupt the mergeinfo on future commits.</p> <p><strong>What I'm looking for is a workaround:</strong> how can I easily tell git not to copy mergeinfo lines for the branch being merged into, or alternatively how can I tell SVN to remove those self-references upon commit (or any other solution which doesn't result in a self-referencing mergeinfo line but does preserve the other qualities of automatic svn:mergeinfo creation from git).</p> <p>(For clarification, I am <em>not</em> looking for people to quote the git manual to me or tell me that "merging with Git-SVN is dangerous and not supported". Please only answer if you can help with the issue or propose an alternative workflow. Pointers into the relevant git code would also be helpful since they might allow me to create a patch to solve this. Thanks!)</p>
 

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