[PATCH 0/14] jn/merge-diff3-label

From: Jonathan Nieder <jrnieder@gmail.com>
Date: Mar 21, 2010, 00:25 UTC
Message-ID: <20100321002535.GA23681@progeny.tock>
In-Reply-To: <7vr5ne908y.fsf@alter.siamese.dyndns.org>

Junio C Hamano wrote:

Show 18 quoted lines

> * 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