From: Alexander Gladysh <agladysh@gmail.com>
To: newren@gmail.com
Cc: git@vger.kernel.org, Johannes.Schindelin@gmx.de,
vmiklos@frugalware.org, gitster@pobox.com, spearce@spearce.org
Subject: Re: [PATCH 2/5] Add another rename + D/F conflict testcase
Date: Tue, 29 Jun 2010 12:49:58 +0400 [thread overview]
Message-ID: <AANLkTik6Qt40dZA8Gv26j0SyhkvZt5D2LIm_QBEtmAsU@mail.gmail.com> (raw)
In-Reply-To: <1277773936-12412-3-git-send-email-newren@gmail.com>
> I hope it's not bad style to take someone else's testcase from the mailing
> list and submit it on their behalf as a testsuite addition (nor do I know
> what to do about the signed-off-by line in this case). This is simply the
> testcase Alexander Gladysh posted to the list on March 8. I really like
> his example due to how it serves as a simple case where there are two D/F
> conflicts with a rename across paths involved in both of those D/F
> conflicts.
I have no problem if you use my test case for the Git testsuite. The
more tests — the merrier. :-)
Consider this testcase as signed-off by me.
If you feel that you need to mention my name somewhere and proper Git
headers are a problem — commit comments would do.
If, to honor all formalities, you would need my actual commit — please
tell me, I'll try to submit it.
Alexander.
next prev parent reply other threads:[~2010-06-29 8:50 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-29 1:12 [PATCH 0/5] D/F conflict fixes newren
2010-06-29 1:12 ` [PATCH 1/5] Add additional testcases for D/F conflicts newren
2010-06-29 1:12 ` [PATCH 2/5] Add another rename + D/F conflict testcase newren
2010-06-29 8:49 ` Alexander Gladysh [this message]
2010-06-29 1:12 ` [PATCH 3/5] merge-recursive: Fix D/F conflicts newren
2010-06-29 1:12 ` [PATCH 4/5] merge_recursive: Fix renames across paths below " newren
2010-06-29 7:54 ` Miklos Vajna
2010-06-29 12:52 ` Elijah Newren
2010-06-29 13:36 ` Alex Riesen
2010-06-29 15:55 ` Elijah Newren
2010-06-29 22:33 ` Miklos Vajna
2010-06-30 6:53 ` Alex Riesen
2010-06-29 1:12 ` [PATCH 5/5] fast-import: Handle directories changing into symlinks 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=AANLkTik6Qt40dZA8Gv26j0SyhkvZt5D2LIm_QBEtmAsU@mail.gmail.com \
--to=agladysh@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=newren@gmail.com \
--cc=spearce@spearce.org \
--cc=vmiklos@frugalware.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).