Eric Wong <normalper...@yhbt.net> writes:

> Steven Walter <stevenrwal...@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 <stevenrwal...@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.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to