Skip to content

Instantly share code, notes, and snippets.


Avishay Lavie avish

  • Tel Aviv, Israel
View GitHub Profile
avish / avoid-self-ref-mergeinfo.patch
Created Jun 20, 2012
[PATCH] git svn dcommit: avoid self-referential mergeinfo
View avoid-self-ref-mergeinfo.patch
Date: Wed, 14 Mar 2012 17:45:05 +0200
Subject: [PATCH] git svn dcommit: avoid self-referential mergeinfo
When svn.pushmergeinfo is configured, git svn dcommit tries to automatically populate svn:mergeinfo properties by merging the parent branch's mergeinfo into the committed one on each merge commit. This process can add self-referential mergeinfo lines, i.e. ones that reference the same branch being committed into (e.g. when reintegrating a branch to trunk after previously having merged trunk into it), which are then mishandled by SVN and cause errors in mixed SVN/Git environments.
For more details, see my original report on the issue at [1].
This commit adds a step to git svn dcommit that filters out any mergeinfo lines referencing the target branch from the mergeinfo, thus avoiding the problem.
You can’t perform that action at this time.