From: Elijah Newren <newren@gmail.com>
To: Nick <oinksocket@letterboxes.org>
Cc: git@vger.kernel.org
Subject: Re: cherry-picking a commit clobbers a file which is a directory in the target commit
Date: Mon, 6 Sep 2010 09:20:51 -0600 [thread overview]
Message-ID: <AANLkTimz8qSwefp137-D+vEbsf6soG51u0im9EC911_O@mail.gmail.com> (raw)
In-Reply-To: <4C84B948.9040907@letterboxes.org>
On Mon, Sep 6, 2010 at 3:50 AM, Nick <oinksocket@letterboxes.org> wrote:
> I've been Warnocked. Can anyone point me in the right direction?
It's a bug in the recursive merge strategy (i.e. the default one), and
affects current master as well as 1.7.0.4. The resolve strategy
(which can be used with cherry-pick since 1.7.2) handles this
correctly:
$ git cherry-pick --strategy=resolve branch1
Trying simple merge.
Simple merge failed, trying Automatic merge.
[master e95e377] added falafel
0 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 falafel
I'll investigate.
Elijah
next prev parent reply other threads:[~2010-09-06 15:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-02 16:17 cherry-picking a commit clobbers a file which is a directory in the target commit Nick
2010-09-06 9:50 ` Nick
2010-09-06 15:20 ` Elijah Newren [this message]
2010-09-06 20:47 ` [PATCH 0/3] Fix resolvable rename + D/F conflict testcases Elijah Newren
2010-09-06 20:49 ` Elijah Newren
2010-09-06 20:47 ` [PATCH 1/3] t3509: Add rename + D/F conflict testcases that recursive strategy fails Elijah Newren
2010-09-06 20:47 ` [PATCH 2/3] merge-recursive: Small code cleanup Elijah Newren
2010-09-06 21:25 ` Elijah Newren
2010-09-06 23:49 ` Junio C Hamano
2010-09-07 16:23 ` Schalk, Ken
2010-09-08 6:24 ` Elijah Newren
2010-09-09 20:23 ` Schalk, Ken
2010-10-21 19:43 ` Camille Moncelier
2010-09-06 20:47 ` [PATCH 3/3] merge-recursive: D/F conflicts where was_a_dir/file -> was_a_dir Elijah Newren
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=AANLkTimz8qSwefp137-D+vEbsf6soG51u0im9EC911_O@mail.gmail.com \
--to=newren@gmail.com \
--cc=git@vger.kernel.org \
--cc=oinksocket@letterboxes.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).