From: Thomas Rast <tr@thomasrast•ch>
To: git@vger•kernel.org
Cc: Junio C Hamano <gitster@pobox•com>
Subject: [PATCH v2 0/8] log --remerge-diff
Date: Sat, 22 Feb 2014 10:17:48 +0100 [thread overview]
Message-ID: <cover.1393059605.git.tr@thomasrast.ch> (raw)
This is the second iteration of
http://thread.gmane.org/gmane.comp.version-control.git/241565
Changes since the last version:
* Dropped patches 4 and 5 (log --merge-bases)
* Implemented the "full-file conflict" scheme explained in the
previous cover letter: if the conflicted version is lacking one
stage of a file, it synthesizes a conflict file of the form
<<<<<<<
=======
content of the stage that exists
>>>>>>>
(or the other way around if stage3 is missing). This occurs at
least with delete/modify conflicts.
* Implemented some basic handling of directory/file conflicts. I'm
not completely happy yet -- see the NEEDSWORK comments -- but at
least it gives consistent input to the diffing stage.
This required access to the dir hash, so there's a new patch 7 that
makes this possible.
Patches 1-6 (used to be 1-3 and 6-8) are unchanged.
Thomas Rast (8):
merge-recursive: remove dead conditional in update_stages()
merge-recursive: internal flag to avoid touching the worktree
merge-recursive: -Xindex-only to leave worktree unchanged
combine-diff: do not pass revs->dense_combined_merges redundantly
Fold all merge diff variants into an enum
merge-recursive: allow storing conflict hunks in index
name-hash: allow dir hashing even when !ignore_case
log --remerge-diff: show what the conflict resolution changed
Documentation/merge-strategies.txt | 9 ++
Documentation/rev-list-options.txt | 7 +
builtin/diff-files.c | 5 +-
builtin/diff-tree.c | 2 +-
builtin/diff.c | 12 +-
builtin/fmt-merge-msg.c | 2 +-
builtin/log.c | 9 +-
builtin/merge.c | 1 -
cache.h | 2 +
combine-diff.c | 13 +-
diff-lib.c | 13 +-
diff.h | 6 +-
log-tree.c | 304 ++++++++++++++++++++++++++++++++++++-
merge-recursive.c | 52 ++++---
merge-recursive.h | 3 +
name-hash.c | 19 ++-
revision.c | 15 +-
revision.h | 24 ++-
submodule.c | 3 +-
t/t3030-merge-recursive.sh | 33 ++++
t/t4213-log-remerge-diff.sh | 222 +++++++++++++++++++++++++++
21 files changed, 678 insertions(+), 78 deletions(-)
create mode 100755 t/t4213-log-remerge-diff.sh
--
1.9.0.313.g3d0a325
next reply other threads:[~2014-02-22 9:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-22 9:17 Thomas Rast [this message]
2014-02-22 9:17 ` [PATCH v2 1/8] merge-recursive: remove dead conditional in update_stages() Thomas Rast
2014-02-22 9:17 ` [PATCH v2 2/8] merge-recursive: internal flag to avoid touching the worktree Thomas Rast
2014-02-22 9:17 ` [PATCH v2 3/8] merge-recursive: -Xindex-only to leave worktree unchanged Thomas Rast
2014-02-23 9:07 ` Eric Sunshine
2014-02-23 11:57 ` Thomas Rast
2014-02-23 18:42 ` Eric Sunshine
2014-02-22 9:17 ` [PATCH v2 4/8] combine-diff: do not pass revs->dense_combined_merges redundantly Thomas Rast
2014-02-22 9:17 ` [PATCH v2 5/8] Fold all merge diff variants into an enum Thomas Rast
2014-02-22 9:17 ` [PATCH v2 6/8] merge-recursive: allow storing conflict hunks in index Thomas Rast
2014-02-22 9:17 ` [PATCH v2 7/8] name-hash: allow dir hashing even when !ignore_case Thomas Rast
2014-02-23 9:19 ` Eric Sunshine
2014-09-06 17:46 ` Thomas Rast
2014-02-27 23:20 ` Junio C Hamano
2014-02-22 9:17 ` [PATCH v2 8/8] log --remerge-diff: show what the conflict resolution changed Thomas Rast
2014-02-27 0:40 ` Junio C Hamano
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=cover.1393059605.git.tr@thomasrast.ch \
--to=tr@thomasrast$(echo .)ch \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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