From: Sam Vilain <sam@vilain.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: Andrew Myrick <amyrick@apple.com>,
Eric Wong <normalperson@yhbt.net>,
git@vger.kernel.org
Subject: Re: Regression: git-svn clone failure
Date: Wed, 23 Dec 2009 13:09:14 +1300 [thread overview]
Message-ID: <4B315FAA.2090708@vilain.net> (raw)
In-Reply-To: <7vbphqzo2y.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> Sam Vilain <sam@vilain.net> writes:
>
>> 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.
>> ...
>> 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; ... might ... if ...
>>
>> Signed-off-by: Sam Vilain <sam@vilain.net>
>>
>
> If I were _using_ git-svn (or any other tool), I would rather be forced to ... sort out the conflict myself ... rather than an automated but unreliable operation that drops changes randomly, ... 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.
>
Welcome to the world of SVN, Junio. It's a world of sunshine and
happiness, pain and despair.
Sam.
next prev parent reply other threads:[~2009-12-23 0:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-22 18:43 Regression: git-svn clone failure Andrew Myrick
2009-12-22 19:21 ` Eric Wong
2009-12-22 19:38 ` Andrew Myrick
2009-12-22 20:26 ` Eric Wong
2009-12-22 21:13 ` Sam Vilain
2009-12-22 21:38 ` Junio C Hamano
2009-12-23 0:09 ` Sam Vilain [this message]
2009-12-22 23:50 ` Andrew Myrick
2009-12-23 0:09 ` Sam Vilain
2009-12-22 20:35 ` [spf:guess] " Sam Vilain
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B315FAA.2090708@vilain.net \
--to=sam@vilain.net \
--cc=amyrick@apple.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=normalperson@yhbt.net \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.