From: Andrew Wong <andrew.kw.w@gmail.com>
To: git@vger.kernel.org
Cc: Andrew Wong <andrew.kw.w@gmail.com>
Subject: [RFC 0/3] git-svn: Add support for cherry-pick merges
Date: Thu, 28 Nov 2013 10:52:14 -0500 [thread overview]
Message-ID: <1385653937-29595-1-git-send-email-andrew.kw.w@gmail.com> (raw)
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
next reply other threads:[~2013-11-28 15:52 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-28 15:52 Andrew Wong [this message]
2013-11-28 15:52 ` [RFC 1/3] git-svn: Generate mergeinfo for every commit Andrew Wong
2013-11-28 15:52 ` [RFC 2/3] git-svn: Support cherry-pick merges Andrew Wong
2013-11-28 15:52 ` [RFC 3/3] git-svn: Add config to control the path of mergeinfo Andrew Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1385653937-29595-1-git-send-email-andrew.kw.w@gmail.com \
--to=andrew.kw.w@gmail.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).