Subject: Re: [PATCH 1/2] git-svn: ignore changeless commits when checking for a cherry-pick

From: Eric Wong <[email-masked]>
Date: Thu, 7 Jan 2010 01:50:17 -0800

Andrew Myrick <[email-masked]> wrote:
> Update git-svn to ignore commits that do not change the tree when it is
> deciding if an svn merge ticket represents a real branch merge or just a
> cherry-pick.
> 
> Consider the following integration model in the svn repository:
> 
>    F---G  branch1
>   /     \
>  D  tag1 \   E  tag2
> /         \ /
> A---B      C  trunk
> 
> branch1 is merged to trunk in commit C.
> 
> With this patch, git-svn will correctly identify branch1 as a proper merge
> parent, instead of incorrectly ignoring it as a cherry-pick.
> 
> Signed-off-by: Andrew Myrick <[email-masked]>
> ---

Thanks Andrew,

I've added Acks for Sam and myself for this series and pushed out to
git://git.bogomips.org/git-svn:

Andrew Myrick (2):
      git-svn: ignore changeless commits when checking for a cherry-pick
      git-svn: handle merge-base failures

-- 
Eric Wong