From: Jonathan Nieder <jrnieder@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Bert Wesarg <bert.wesarg@googlemail.com>
Subject: [PATCH 0/14] jn/merge-diff3-label
Date: Sat, 20 Mar 2010 19:25:36 -0500 [thread overview]
Message-ID: <20100321002535.GA23681@progeny.tock> (raw)
In-Reply-To: <7vr5ne908y.fsf@alter.siamese.dyndns.org>
Junio C Hamano wrote:
> * jn/merge-diff3-label (2010-03-17) 13 commits
> . cherry-pick, revert: add a label for ancestor
> . revert: clarify label on conflict hunks
> . compat: add mempcpy()
> . tests: document cherry-pick behavior in face of conflicts
> . checkout -m --conflict=diff3: add a label for ancestor
> . tests: document format of conflicts from checkout -m
> . merge_trees(): add ancestor label parameter for diff3-style output
> . merge_file(): add comment explaining behavior wrt conflict style
> . checkout --conflict=diff3: add a label for ancestor
> . ll_merge(): add ancestor label parameter for diff3-style output
> . merge-file --diff3: add a label for ancestor
> . xdl_merge(): move file1 and file2 labels to xmparam structure
> . xdl_merge(): add optional ancestor label to diff3-style output
>
> This somewhat conflicts with bw/union-merge-refactor that in 'master'; I
> could resolve the conflicts myself, but I'd rather not. Jonathan, could
> you rebase the series?
Sure thing. Here is the latest verison.
Jonathan Nieder (14):
tests: document format of conflicts from checkout -m
tests: document cherry-pick behavior in face of conflicts
xdl_merge(): add optional ancestor label to diff3-style output
xdl_merge(): move file1 and file2 labels to xmparam structure
merge-file --diff3: add a label for ancestor
ll_merge(): add ancestor label parameter for diff3-style output
checkout --conflict=diff3: add a label for ancestor
merge_file(): add comment explaining behavior wrt conflict style
merge_trees(): add ancestor label parameter for diff3-style output
checkout -m --conflict=diff3: add a label for ancestor
compat: add mempcpy()
revert: clarify label on conflict hunks
cherry-pick, revert: add a label for ancestor
merge-recursive: add a label for ancestor
builtin/checkout.c | 3 +-
builtin/merge-file.c | 6 +-
builtin/revert.c | 103 +++++++++++++--------
git-compat-util.h | 9 ++
ll-merge.c | 24 +++--
ll-merge.h | 2 +-
merge-file.c | 8 ++-
merge-recursive.c | 12 ++-
merge-recursive.h | 1 +
rerere.c | 4 +-
t/t3507-cherry-pick-conflict.sh | 198 +++++++++++++++++++++++++++++++++++++++
t/t6023-merge-file.sh | 4 +-
t/t7201-co.sh | 69 ++++++++++++-
xdiff/xdiff.h | 6 +-
xdiff/xmerge.c | 35 +++++--
15 files changed, 405 insertions(+), 79 deletions(-)
create mode 100644 t/t3507-cherry-pick-conflict.sh
next prev parent reply other threads:[~2010-03-21 0:24 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-20 21:00 What's cooking in git.git (Mar 2010, #05; Sat, 20) Junio C Hamano
2010-03-21 0:25 ` Jonathan Nieder [this message]
2010-03-21 0:27 ` [PATCH 01/14] tests: document format of conflicts from checkout -m Jonathan Nieder
2010-03-21 0:28 ` [PATCH 02/14] tests: document cherry-pick behavior in face of conflicts Jonathan Nieder
2010-03-21 0:31 ` [PATCH 03/14] xdl_merge(): add optional ancestor label to diff3-style output Jonathan Nieder
2010-03-21 0:35 ` [PATCH 04/14] xdl_merge(): move file1 and file2 labels to xmparam structure Jonathan Nieder
2010-03-21 0:37 ` [PATCH 05/14] merge-file --diff3: add a label for ancestor Jonathan Nieder
2010-03-21 0:38 ` [PATCH 06/14] ll_merge(): add ancestor label parameter for diff3-style output Jonathan Nieder
2010-03-21 0:40 ` [PATCH 07/14] checkout --conflict=diff3: add a label for ancestor Jonathan Nieder
2010-03-21 0:40 ` [PATCH 08/14] merge_file(): add comment explaining behavior wrt conflict style Jonathan Nieder
2010-03-21 0:41 ` [PATCH 09/14] merge_trees(): add ancestor label parameter for diff3-style output Jonathan Nieder
2010-03-21 0:42 ` [PATCH 10/14] checkout -m --conflict=diff3: add a label for ancestor Jonathan Nieder
2010-03-21 0:43 ` [PATCH 11/14] compat: add mempcpy() Jonathan Nieder
2010-03-21 0:45 ` [PATCH 12/14] revert: clarify label on conflict hunks Jonathan Nieder
2010-03-21 0:46 ` [PATCH 13/14] cherry-pick, revert: add a label for ancestor Jonathan Nieder
2010-03-21 0:52 ` [PATCH 14/14] merge-recursive: " Jonathan Nieder
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=20100321002535.GA23681@progeny.tock \
--to=jrnieder@gmail.com \
--cc=bert.wesarg@googlemail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).