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

Re: [PATCH 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 21, 2012, 22:38 UTC
Message-ID
<7vobm3c1lg.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20120821220556.GA5848@dcvr.yhbt.net>
Eric Wong <normalperson@yhbt.net> writes:
Show 15 quoted lines
> Steven Walter <stevenrwalter@gmail.com> wrote:
>> Consider the case where you have trunk, branch1 of trunk, and branch2 of
>> branch1.  trunk is merged back into branch2, and then branch2 is
>> reintegrated into trunk.  The merge of branch2 into trunk will have
>> svn:mergeinfo property references to both branch1 and branch2.  When
>> git-svn fetches the commit that merges branch2 (check_cherry_pick),
>> it is necessary to eliminate the merged contents of branch1 as well as
>> branch2, or else the merge will be incorrectly ignored as a cherry-pick.
>> 
>> Signed-off-by: Steven Walter <stevenrwalter@gmail.com>
>
> Thanks, I've Signed-off (also added Sam's Reviewed-by) and
> pushed to "for-git-master" on git://bogomips.org/git-svn
>
> (Will wait on a few other patches before asking Junio to pull)

If there are stuff that should go to 1.7.12 maintenance track, please separate them from new features and risky improvements.

Thanks.
Previous: Eric WongNext: Eric Wong
Message 11 of 13 in “git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip”
  1. 1/2 git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tipSteven Walter, Aug 11, 2012
  2. 2/2 git-svn.perl: keep processing all commits in parents_excludeSteven Walter, Aug 11, 2012
  3. Sam VilainAug 18, 2012
  4. Steven WalterAug 18, 2012
  5. Sam VilainAug 18, 2012
  6. Junio C HamanoAug 18, 2012
  7. Eric WongAug 19, 2012
  8. 1/2 git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tipSteven Walter, Aug 20, 2012
  9. 2/2 git-svn.perl: keep processing all commits in parents_excludeSteven Walter, Aug 20, 2012
  10. Eric WongAug 21, 2012
  11. Junio C HamanoAug 21, 2012
  12. Eric WongAug 13, 2012
  13. Sam VilainAug 18, 2012

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.