This is a work-in-progress for adding support for cherry-pick merges. When using git-svn, cherry-picked commits from another git-svn branch are now being treated as simple commits. But in SVN, if the user uses "svn merge -c" to cherry-pick commits from another SVN branch, SVN records that information in svn:mergeinfo. These patches will enable git-svn to do the same.
Andrew Wong (3): git-svn: Generate mergeinfo for every commit git-svn: Support cherry-pick merges git-svn: Add config to control the path of mergeinfo git-svn.perl | 79 ++++++++++++++++++++++++++++++++++----- perl/Git/SVN/Editor.pm | 5 ++- t/t9161-git-svn-mergeinfo-push.sh | 67 +++++++++++++++++++++++++++++++++ 3 files changed, 141 insertions(+), 10 deletions(-) -- 1.8.5.rc3.5.g96ccada -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
