From: Junio C Hamano <gitster@pobox.com>
To: Eric Wong <normalperson@yhbt.net>
Cc: Steven Walter <stevenrwalter@gmail.com>,
sam@vilain.net, avarab@gmail.com, git@vger.kernel.org
Subject: Re: [PATCH 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip
Date: Tue, 21 Aug 2012 15:38:35 -0700 [thread overview]
Message-ID: <7vobm3c1lg.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <20120821220556.GA5848@dcvr.yhbt.net> (Eric Wong's message of "Tue, 21 Aug 2012 22:05:56 +0000")
Eric Wong <normalperson@yhbt.net> writes:
> 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.
next prev parent reply other threads:[~2012-08-21 22:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-11 17:14 [PATCH v3 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip Steven Walter
2012-08-11 17:14 ` [PATCH v3 2/2] git-svn.perl: keep processing all commits in parents_exclude Steven Walter
2012-08-18 19:51 ` Sam Vilain
2012-08-18 20:43 ` Steven Walter
2012-08-18 23:37 ` Sam Vilain
2012-08-18 23:43 ` Junio C Hamano
2012-08-19 19:33 ` Eric Wong
2012-08-20 1:39 ` [PATCH 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip Steven Walter
2012-08-20 1:39 ` [PATCH 2/2] git-svn.perl: keep processing all commits in parents_exclude Steven Walter
2012-08-21 22:05 ` [PATCH 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip Eric Wong
2012-08-21 22:38 ` Junio C Hamano [this message]
2012-08-13 7:08 ` [PATCH v3 " Eric Wong
2012-08-18 19:49 ` Sam Vilain
-- strict thread matches above, loose matches on Subject: below --
2012-05-24 0:40 [PATCH " Steven Walter
2012-05-24 3:02 ` Eric 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vobm3c1lg.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
--cc=sam@vilain.net \
--cc=stevenrwalter@gmail.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).