From: Stephen Boyd <bebarino@gmail.com>
To: Johan Herland <johan@herland.net>
Cc: git@vger.kernel.org
Subject: Re: [WIP/RFC 12/13] git notes merge: Add automatic conflict resolvers (ours, theirs, union)
Date: Sat, 24 Jul 2010 01:18:11 -0700 [thread overview]
Message-ID: <4C4AA1C3.8030907@gmail.com> (raw)
In-Reply-To: <1279880104-29796-13-git-send-email-johan@herland.net>
On 07/23/2010 03:15 AM, Johan Herland wrote:
> +
> +# Set up a notes merge scenario with all kinds of potential conflicts
> +test_expect_success 'setup commits' '
> + # Create 15 commits with tags ("1st" through "15th")
> + :> a1&& git add a1&& test_tick&& git commit -m 1st&& git tag 1st&&
> + :> a2&& git add a2&& test_tick&& git commit -m 2nd&& git tag 2nd&&
> + :> a3&& git add a3&& test_tick&& git commit -m 3rd&& git tag 3rd&&
> + :> a4&& git add a4&& test_tick&& git commit -m 4th&& git tag 4th&&
> + :> a5&& git add a5&& test_tick&& git commit -m 5th&& git tag 5th&&
> + :> a6&& git add a6&& test_tick&& git commit -m 6th&& git tag 6th&&
> + :> a7&& git add a7&& test_tick&& git commit -m 7th&& git tag 7th&&
> + :> a8&& git add a8&& test_tick&& git commit -m 8th&& git tag 8th&&
> + :> a9&& git add a9&& test_tick&& git commit -m 9th&& git tag 9th&&
> + :> a10&& git add a10&& test_tick&& git commit -m 10th&& git tag 10th&&
> + :> a11&& git add a11&& test_tick&& git commit -m 11th&& git tag 11th&&
> + :> a12&& git add a12&& test_tick&& git commit -m 12th&& git tag 12th&&
> + :> a13&& git add a13&& test_tick&& git commit -m 13th&& git tag 13th&&
> + :> a14&& git add a14&& test_tick&& git commit -m 14th&& git tag 14th&&
> + :> a15&& git add a15&& test_tick&& git commit -m 15th&& git tag 15th
> +'
Can you use test_commit here?
next prev parent reply other threads:[~2010-07-24 8:18 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-23 10:14 [WIP/RFC 00/13] git notes merge Johan Herland
2010-07-23 10:14 ` [WIP/RFC 01/13] (trivial) notes.h: Minor documentation fixes to copy_notes() Johan Herland
2010-07-23 10:14 ` [WIP/RFC 02/13] notes.h: Make default_notes_ref() available in notes API Johan Herland
2010-07-23 10:14 ` [WIP/RFC 03/13] notes.h/c: Clarify the handling of notes objects that are == null_sha1 Johan Herland
2010-07-23 10:14 ` [WIP/RFC 04/13] notes.h/c: Propagate combine_notes_fn return value to add_note() and beyond Johan Herland
2010-07-23 15:23 ` Jonathan Nieder
2010-07-23 22:39 ` Johan Herland
2010-07-23 10:14 ` [WIP/RFC 05/13] (trivial) t3303: Indent with tabs instead of spaces for consistency Johan Herland
2010-07-23 10:14 ` [WIP/RFC 06/13] notes.c: Use two newlines (instead of one) when concatenating notes Johan Herland
2010-07-23 10:14 ` [WIP/RFC 07/13] (trivial) git notes prune: Accept --verbose in addition to -v Johan Herland
2010-07-23 10:14 ` [WIP/RFC 08/13] builtin/notes.c: Split notes ref DWIMmery into a separate function Johan Herland
2010-07-23 10:15 ` [WIP/RFC 09/13] git notes merge: Initial implementation handling trivial merges only Johan Herland
2010-07-24 8:32 ` Stephen Boyd
2010-07-25 14:14 ` Johan Herland
2010-07-23 10:15 ` [WIP/RFC 10/13] builtin/notes.c: Refactor creation of notes commits Johan Herland
2010-07-23 10:15 ` [WIP/RFC 11/13] git notes merge: Handle real, non-conflicting notes merges Johan Herland
2010-07-23 10:15 ` [WIP/RFC 12/13] git notes merge: Add automatic conflict resolvers (ours, theirs, union) Johan Herland
2010-07-24 8:18 ` Stephen Boyd [this message]
2010-07-25 18:58 ` Johan Herland
2010-07-23 10:15 ` [WIP/RFC 13/13] Documentation: Preliminary docs on 'git notes merge' Johan Herland
2010-07-24 8:21 ` Stephen Boyd
2010-07-25 19:02 ` Johan Herland
2010-07-25 10:45 ` [WIP/RFC 00/13] git notes merge Sam Vilain
2010-07-25 16:44 ` Johan Herland
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=4C4AA1C3.8030907@gmail.com \
--to=bebarino@gmail.com \
--cc=git@vger.kernel.org \
--cc=johan@herland.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.