From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, spearce@spearce.org, agladysh@gmail.com
Subject: Re: [PATCHv3 2/6] Add a rename + D/F conflict testcase
Date: Wed, 7 Jul 2010 23:04:38 -0600 [thread overview]
Message-ID: <AANLkTimLnUHMlXwLwuHsKPibw53lbi4x_LPEgmYtbW9V@mail.gmail.com> (raw)
In-Reply-To: <7vhbkbt24d.fsf@alter.siamese.dyndns.org>
On Wed, Jul 7, 2010 at 3:26 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> diff --git a/t/t3508-cherry-pick-merge-df.sh b/t/t3508-cherry-pick-merge-df.sh
>> new file mode 100755
>> index 0000000..646a56d
>> --- /dev/null
>> +++ b/t/t3508-cherry-pick-merge-df.sh
>> @@ -0,0 +1,34 @@
>> ...
>> + touch f1 &&
>> + git add f1 &&
>> + git commit -m "f1"
>> +'
>> +
>> +test_expect_failure 'Cherry-pick succeeds with rename across D/F conflicts' '
>> + git checkout master &&
>> + git cherry-pick branch
>> +'
>
> This is curious. "branch" only adds a totally unrelated path to its
> parent, and picking it should be trivial. I wonder what it does
> here if we used the resolve strategy...
It works with the resolve strategy. I could add a testcase for it in
the next resend, though using the --strategy option will make the
series depend on master and make it no longer apply to maint. Is that
an issue?
next prev parent reply other threads:[~2010-07-08 5:04 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-07 5:20 [PATCHv3 0/6] D/F conflict fixes newren
2010-07-07 5:20 ` [PATCHv3 1/6] Add additional testcases for D/F conflicts newren
2010-07-07 21:25 ` Junio C Hamano
2010-07-08 3:07 ` Elijah Newren
2010-07-08 16:03 ` Junio C Hamano
2010-07-07 5:20 ` [PATCHv3 2/6] Add a rename + D/F conflict testcase newren
2010-07-07 21:26 ` Junio C Hamano
2010-07-08 5:04 ` Elijah Newren [this message]
2010-07-07 5:20 ` [PATCHv3 3/6] merge-recursive: Fix D/F conflicts newren
2010-07-07 21:40 ` Junio C Hamano
2010-07-08 4:34 ` Elijah Newren
2010-07-07 5:20 ` [PATCHv3 4/6] merge_recursive: Fix renames across paths below " newren
2010-07-07 5:20 ` [PATCHv3 5/6] fast-export: Fix output order of D/F changes newren
2010-07-07 21:40 ` Junio C Hamano
2010-07-08 4:36 ` Elijah Newren
2010-07-08 6:04 ` Junio C Hamano
2010-07-07 5:20 ` [PATCHv3 6/6] fast-import: Improve robustness when D->F changes provided in wrong order 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTimLnUHMlXwLwuHsKPibw53lbi4x_LPEgmYtbW9V@mail.gmail.com \
--to=newren@gmail.com \
--cc=agladysh@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=spearce@spearce.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).