On Thu, Mar 8, 2012 at 12:23 AM, Junio C Hamano <gitster@xxxxxxxxx> wrote:
> Phil Hord <phil.hord@xxxxxxxxx> writes:
>
>>>> .... 'mergetool' uses this command to
>>>> avoid asking the user to resolve files which git rerere already
>>>> resolved for her.
>>>
>>> Ok, so "Print paths with conflicts that are not resolved." indeed is
>>> sufficient.
>>
>> If you goal is to say as little as possible, then yes. But I had to
>> read the related commit messages several times before it dawned on me
>> what the distinction was.
>
> The goal is "Concise, coherent and clear"; "as little as possible"
> never is. We need to elaborate as needed but make sure we do not
> tire readers with irrelevant explanation.
>
> The first problem I had with the patch (go back and re-read the
> patch and its initial review) was "Like 'diff', but...". It is not
> "Like diff" at all (if anything, it is more like "status", but
> "status" in turn is not "Like diff" either). We can first drop that
> part and spend more words to describe what it really is.
No disagreement here.
>> The main problem was that I didn't
>> understand that I was missing 'rerere.autoupdate=true' in my config,
>> or why it mattered. I only know that rerere was letting me down
>> sometimes, and 'rerere remaining' seemed to be missing some
>> clearly-still-unresolved files.
>
> Personally, I think you are being *good* by not using autoupdate.
> Once you let rerere auto-update, it will become hard to notice a
> mismerge when previous resolution is applied when it shouldn't, and
> even harder to correct it ("checkout -m" will not work).
Slightly off-topic, but here's why autoupdate=false is a problem, and
why I thought rerere-remaining was broken for the last year. When I
rebase a branch, git magically plows through dozens of commits and
stops to tell me when there's a merge conflict that needs my
attention. Not having a GUI means I have to do something (type
commands or parse output) to see what's happened. But the solution to
"resolve these conflicts" is always the same: git-mergetool && git
rebase --continue.
Except with rerere enabled.
$ git rebase origin/master
Noise, noise, noise
Resolved 'foo' using previous resolution.
Failed to merge in the changes.
I reach for my utility belt, but my usual tricks all fail at this point:
$ git mergetool
No files need merging
$ git rebase --continue
foo: needs merge
$ git diff foo
diff --cc foo
index 5716ca5,7601807..0000000
--- i/foo
+++ w/foo
The last one looks to me, the uninitiated, like a file with no
changes. I know better now, but I didn't before. The only thing that
works is this, but I didn't know why:
$ git add foo
Now I know why, and it just pisses me off. I thought rerere was
supposed to save me from this drudgery, especially when I am rebasing
the same branch multiple times (part of a migration effort).
I think I know the solution now. 'mergetool' should never have
ignored these files. Instead, it should tell me about them:
$ git mergetool
Merging:
foo
Normal merge conflict for 'foo' was resolved using previous resolution.
hint: to re-examine the resolution, use "git diff -c foo"
hint: to accept this resolution, add it to the index with "git add foo"
No more files need merging.
I didn't know how to spell "diff -c" before, but I also didn't know it
was what I needed
>> Thanks to this proposal, I understand it better now. But not from
>> reading this email thread.
>
> Care to give a crack at it, then?
Yeah, right. Remember, it took me three tries reading the actual
commit messages to understand what was even going on. I'm probably
too thick for this.
How's this:
-- >8 --
Subject: [PATCH] rerere: Document 'rerere remaining'
This adds the 'remaining' command to the documentation of
'git rerere'. This command was added in ac49f5ca (Feb 16 2011;
Martin von Zweigbergk <martin.von.zweigbergk@xxxxxxxxx>) but
it was never documented.
Touch up the other rerere commands to reduce noise.
Signed-off-by: Phil Hord <phil.hord@xxxxxxxxx>
Signed-off-by: Vincent van Ravesteijn <vfr@xxxxxxx>
---
Do you think the touch-ups are overkill?
Also, I think 'rerere diff' could use a rewrite.
Documentation/git-rerere.txt | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/Documentation/git-rerere.txt b/Documentation/git-rerere.txt
index a6253ba..b43b7c8 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -8,7 +8,7 @@ git-rerere - Reuse recorded resolution of conflicted merges
SYNOPSIS
--------
[verse]
-'git rerere' ['clear'|'forget' <pathspec>|'diff'|'status'|'gc']
+'git rerere' ['clear'|'forget' <pathspec>|'diff'|'remaining'|'status'|'gc']
DESCRIPTION
-----------
@@ -37,30 +37,35 @@ its working state.
'clear'::
-This resets the metadata used by rerere if a merge resolution is to be
+Reset the metadata used by rerere if a merge resolution is to be
aborted. Calling 'git am [--skip|--abort]' or 'git rebase [--skip|--abort]'
will automatically invoke this command.
'forget' <pathspec>::
-This resets the conflict resolutions which rerere has recorded for the current
+Reset the conflict resolutions which rerere has recorded for the current
conflict in <pathspec>.
'diff'::
-This displays diffs for the current state of the resolution. It is
+Display diffs for the current state of the resolution. It is
useful for tracking what has changed while the user is resolving
conflicts. Additional arguments are passed directly to the system
'diff' command installed in PATH.
'status'::
-Like 'diff', but this only prints the filenames that will be tracked
-for resolutions.
+Print paths with conflicts whose merge resolution rerere will record.
+
+'remaining'::
+
+Print paths with conflicts that have not been autoresolved by rerere.
+This includes paths whose resolutions cannot be tracked by rerere,
+such as conflicting submodules.
'gc'::
-This prunes records of conflicted merges that
+Prune records of conflicted merges that
occurred a long time ago. By default, unresolved conflicts older
than 15 days and resolved conflicts older than 60
days are pruned. These defaults are controlled via the
--
1.7.9.3
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html