From: Junio C Hamano <gitster@pobox.com>
To: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Cc: git@vger.kernel.org, Thomas Rast <tr@thomasrast.ch>
Subject: Re: [PATCH v2 1/2] mergetool: don't skip modify/remove conflicts
Date: Tue, 15 Feb 2011 12:12:18 -0800 [thread overview]
Message-ID: <7vbp2dnjkt.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <alpine.DEB.2.00.1102142204240.7843@debian> (Martin von Zweigbergk's message of "Mon\, 14 Feb 2011 22\:30\:55 -0500 \(EST\)")
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> writes:
> On Mon, 14 Feb 2011, Junio C Hamano wrote:
>
>> But shouldn't you also revert the parts of my patch to do_plain_rerere()
>> and rerere_forget() that have similar special cases?
>
> Yep, done in patch 2/2.
>
> Your changes in find_conflicts() are still there after patch 1/2 and
> since do_plain_rerere() and rerere_forget() call find_conflicts(), I
> think they need to check for the punted paths. Only the callers of
> setup_rerere() no longer need to care.
>
> In patch 2/2, I refactored a bit more, so that find_conflicts()
> behaves the way it did before your first patch, and then the checks
> for punted paths are removed from the callers.
>
> If you think the second one is good, it could easily be squashed with
> the first one. I left it separate because I wasn't quite sure.
Probably the changes to rerere proper from all three patches should be
squashed into one, and then the patch to the script to use the new feature
can be applied on top of it.
next prev parent reply other threads:[~2011-02-15 20:12 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-08 3:08 [PATCH] mergetool: don't skip modify/remove conflicts Martin von Zweigbergk
2011-02-09 21:45 ` Junio C Hamano
2011-02-11 2:46 ` Martin von Zweigbergk
2011-02-13 4:09 ` [PATCH v2 0/2] " Martin von Zweigbergk
2011-02-13 4:09 ` [PATCH v2 1/2] " Martin von Zweigbergk
2011-02-15 0:54 ` Junio C Hamano
2011-02-15 3:30 ` Martin von Zweigbergk
2011-02-15 20:12 ` Junio C Hamano [this message]
2011-02-16 10:47 ` [PATCH v3 0/2] " Martin von Zweigbergk
2011-02-16 10:47 ` [PATCH v3 1/2] rerere "remaining" Martin von Zweigbergk
2011-02-16 21:14 ` Junio C Hamano
2011-02-16 10:47 ` [PATCH v3 2/2] mergetool: don't skip modify/remove conflicts Martin von Zweigbergk
2011-02-13 4:09 ` [PATCH v2 2/2] rerere: factor out common conflict search code Martin von Zweigbergk
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vbp2dnjkt.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=martin.von.zweigbergk@gmail.com \
--cc=tr@thomasrast.ch \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).