Re: git-svn and mergeinfo
From: Bryan Jacobs <hidden>
Date: 2016-06-15 22:51:57
On Wed, 31 Aug 2011 15:59:26 +0200 Sverre Rabbelier [off-list ref] wrote:
Why not submit this as a proper patch [0] to the list, I reckon Eric (cc-ed, the maintainer of git-svn) wouldn't mind including it.
I have submitted a patch, following your conventions as best I could. I
forgot the CC line, sorry Eric!
There was an inaccurate line in the documentation concerning the
svn:mergeinfo property ("git-svn does not currently make use of this")
which I clobbered with my documentation change. I did not document the
whole of how "git svn fetch" deals with the property, but this should
probably be done at some point.
Side notes: It may also be productive to automatically set mergeinfo
when all parents of a merge commit have git-svn-info annotations, but I
have not done this (as I said earlier, I use scripts external to git
for this task). Finally, I am uncertain why the git-svn-info lines are
stored in commit bodies instead of as notes; a notes-based approach
would not involve commit hashes changing when they are pushed to an
upstream SVN server.
Thanks all,
Bryan Jacobs