git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[RFC 0/3] git-svn: Add support for cherry-pick merges

From
Andrew Wong <andrew.kw.w@gmail.com>
Date
Nov 28, 2013, 15:52 UTC
Message-ID
<1385653937-29595-1-git-send-email-andrew.kw.w@gmail.com>
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: Andrew Wong
Message 1 of 4 in “[RFC 0/3] git-svn: Add support for cherry-pick merges”
  1. Andrew WongNov 28, 2013
  2. 1/3 git-svn: Generate mergeinfo for every commitAndrew Wong, Nov 28, 2013
  3. 2/3 git-svn: Support cherry-pick mergesAndrew Wong, Nov 28, 2013
  4. 3/3 git-svn: Add config to control the path of mergeinfoAndrew Wong, Nov 28, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.