Re: Regression: git-svn clone failure

From: Junio C Hamano <gitster@pobox.com>
Date: Dec 22, 2009, 21:38 UTC
Message-ID: <7vbphqzo2y.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1261516416.23944.44.camel@denix>

Sam Vilain <sam@vilain.net> writes:

Show 16 quoted lines

> With git, merge parent relationships imply (conceptually, anyway) that
> all of the changes reachable from that branch are included in the
> commit.  If someone is doing cherry-picking, then they are specifically
> excluding some commits, so adding a merge parent to that branch isn't
> right.  This is what the warning is saying.  It's happening every commit
> because that section of code doesn't know whether a mergeinfo record is
> new or not.
> ...
> Subject: [PATCH] git-svn: consider 90% of a branch cherry picked to be a merge
>
> Be slightly fuzzy when deciding if a branch is a merge or a cherry pick; in
> some instances this might indicate intentionally skipping changes as not
> required, as if they had performed a real merge and then skipped those
> files.
>
> Signed-off-by: Sam Vilain <sam@vilain.net>

If I were _using_ git-svn (or any other tool), I would rather be forced to see overlapping changes from both branches to sort out the conflict myself when I merge such a cherry-picked history, rather than an automated but unreliable operation that drops changes randomly, still records that everything from the branch is now merged, and reports "everything is peachy".

That sounds horrible, as you cannot trust your merges anymore. I hope I am mis-interpreting what you wrote above.