From: Junio C Hamano <gitster@pobox.com>
To: Will Palmer <wmpalmer@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCHv3 1/2] add basic tests for merge-tree
Date: Wed, 14 Jul 2010 12:59:29 -0700 [thread overview]
Message-ID: <7veif5ygv2.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1279127047-3273-2-git-send-email-wmpalmer@gmail.com> (Will Palmer's message of "Wed\, 14 Jul 2010 18\:04\:06 +0100")
Will Palmer <wmpalmer@gmail.com> writes:
> merge-tree had no test cases, so here we add some very basic tests for
> it, including some known-breakages.
>
> Signed-off-by: Will Palmer <wmpalmer@gmail.com>
> ---
> diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh
> new file mode 100755
> index 0000000..c02c986
> --- /dev/null
> +++ b/t/t4300-merge-tree.sh
> @@ -0,0 +1,257 @@
> ...
> +test_expect_'file add A, !B' '
Oops?
I'll queue with obvious/trivial fixups. Thanks.
next prev parent reply other threads:[~2010-07-14 19:59 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-14 17:04 [PATCHv3 0/2] merge-tree: fix (merge-base a b) b a Will Palmer
2010-07-14 17:04 ` [PATCHv3 1/2] add basic tests for merge-tree Will Palmer
2010-07-14 19:59 ` Junio C Hamano [this message]
2010-07-14 17:04 ` [PATCHv3 2/2] fix merge-tree where two branches share no changes Will Palmer
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=7veif5ygv2.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=wmpalmer@gmail.com \
/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).