From: Eric Wong <normalperson@yhbt.net>
Date: Tue, 21 Aug 2012 22:05:56 GMT
Subject: Re: [PATCH 1/2] git-svn.perl: consider all ranges for a given merge, instead of only tip-by-tip
Message-ID: <20120821220556.GA5848@dcvr.yhbt.net>
In-Reply-To: <1345426781-7754-1-git-send-email-stevenrwalter@gmail.com>

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)