From: Junio C Hamano <gitster@pobox.com>
To: Robin Rosenberg <robin.rosenberg.lists@dewire.com>
Cc: "Boyd Stephen Smith Jr." <bss@iguanasuicide.net>, git@vger.kernel.org
Subject: Re: [PATCH] Make git revert warn the user when reverting a merge commit.
Date: Sun, 21 Dec 2008 02:59:30 -0800 [thread overview]
Message-ID: <7v8wq9rdyl.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <200812211109.36788.robin.rosenberg.lists@dewire.com> (Robin Rosenberg's message of "Sun, 21 Dec 2008 11:09:36 +0100")
Robin Rosenberg <robin.rosenberg.lists@dewire.com> writes:
> One could consider keeping the contributions from ^1 a special case and not
> mention the parent, making it look like any revert commit. I guess most merge
> reverts are like this in practice.
I think that makes sense. There are cases where the mainline maintainer
punts a merge and pass the baton to a subsystem maintainer, saying "Your
tree has many conflicts with my tip, and I'd rather ask you to resolve it"
(and after such a merge, the mainline maintainer will fast forward to the
result), in which case the merge will be in the reverse direction, but
that should be rare. Reverting such a merge later from the mainline's
point of view would involve "revert -m 2".
So if your patch is tightened a bit to record extra information only in
such a case, I think that would be an acceptable approach to the issue.
next prev parent reply other threads:[~2008-12-21 11:00 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-19 2:39 [PATCH] Make git revert warn the user when reverting a merge commit Boyd Stephen Smith Jr.
2008-12-19 2:57 ` Johannes Schindelin
2008-12-19 3:03 ` Junio C Hamano
2008-12-19 3:29 ` Boyd Stephen Smith Jr.
2008-12-19 3:55 ` Jay Soffian
2008-12-19 5:54 ` Boyd Stephen Smith Jr.
2008-12-19 6:35 ` Junio C Hamano
2008-12-19 18:07 ` Alan
2008-12-19 3:24 ` Boyd Stephen Smith Jr.
2008-12-20 7:08 ` Robin Rosenberg
2008-12-20 22:54 ` Boyd Stephen Smith Jr.
2008-12-20 23:31 ` Robin Rosenberg
2008-12-21 2:37 ` Junio C Hamano
2008-12-21 3:11 ` Boyd Stephen Smith Jr.
2008-12-21 10:09 ` Robin Rosenberg
2008-12-21 10:59 ` Junio C Hamano [this message]
2008-12-21 19:59 ` Boyd Stephen Smith Jr.
2008-12-21 20:23 ` Junio C Hamano
2008-12-21 21:13 ` Boyd Stephen Smith Jr.
2008-12-21 22:17 ` Junio C Hamano
2008-12-21 22:38 ` Junio C Hamano
2008-12-21 22:40 ` Robin Rosenberg
2008-12-21 22:46 ` Junio C Hamano
2008-12-21 22:56 ` Robin Rosenberg
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=7v8wq9rdyl.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=bss@iguanasuicide.net \
--cc=git@vger.kernel.org \
--cc=robin.rosenberg.lists@dewire.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.