git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Mike Ralphson" <mike.ralphson@gmail.com>
To: "Jeff King" <peff@peff.net>
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
	sverre@rabbelier.nl, "Git Mailinglist" <git@vger.kernel.org>,
	"Miklos Vajna" <vmiklos@frugalware.org>
Subject: Re: theirs/ours was Re: [PATCH 6/6] Add a new test for using a custom merge strategy
Date: Tue, 29 Jul 2008 10:36:32 +0100	[thread overview]
Message-ID: <e2b179460807290236k214b41f2wee25c213d7c95ae3@mail.gmail.com> (raw)
In-Reply-To: <20080729050218.GD26997@sigill.intra.peff.net>

2008/7/29 Jeff King <peff@peff.net>:
> On Mon, Jul 28, 2008 at 05:37:33PM -0700, Junio C Hamano wrote:
>
> I just didn't want history thrown away for two reasons:
>
>  - historical interest; some of the commits had counterparts in devel
>    that were done differently (because the two branches had diverged),
>    but it might later be interesting to see how and why the stable
>    changes were done (e.g., if a similar situation arose)
>
>  - this project did not rebase, favoring the simplicity of "git pull"
>    over clean history.
>
> Bear in mind that this project was not very big. I think devel had ~20
> commits, and stable had about ~5. So it was easy to get such confidence.

Is there any reason you couldn't have reverted the stable commits in
preparation for the merge from devel?

I.e. these commits were necessary to fix problems in production, they
now need to be reverted in order to cleanly apply the changes for the
next stable version, which includes fixes for all of these problems.

I can see you'd be preserving twice as much history instead of
throwing any away, but if scalability became an issue, you could
always squash all the reverts into one pre-merge commit.

git-merge-theirs-revert anyone?

Mike

  reply	other threads:[~2008-07-29  9:37 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-28 14:54 theirs/ours was Re: [PATCH 6/6] Add a new test for using a custom merge strategy Sverre Rabbelier
2008-07-28 18:14 ` Miklos Vajna
2008-07-28 19:48   ` Sverre Rabbelier
2008-07-28 18:56 ` Jeff King
2008-07-28 19:09   ` Johannes Schindelin
2008-07-28 19:26     ` Jeff King
2008-07-28 20:00       ` Avery Pennarun
2008-07-28 23:27       ` Johannes Schindelin
2008-07-29  0:09         ` Sverre Rabbelier
2008-07-29  4:31           ` Jeff King
2008-07-29  4:38         ` Jeff King
2008-07-29 11:05           ` Johannes Schindelin
2008-07-29 12:36             ` Jeff King
2008-07-29 12:42               ` Sverre Rabbelier
2008-07-29  0:37       ` Junio C Hamano
2008-07-29  5:02         ` Jeff King
2008-07-29  9:36           ` Mike Ralphson [this message]
2008-07-29 12:42             ` Jeff King
2008-07-28 19:52     ` Sverre Rabbelier
2008-07-28 20:07     ` Junio C Hamano
2008-07-28 20:10       ` Sverre Rabbelier
2008-07-28 20:20         ` Junio C Hamano
2008-07-28 20:24           ` Sverre Rabbelier
2008-07-28 21:16             ` Junio C Hamano
2008-07-28 21:35               ` Junio C Hamano
2008-07-28 21:39                 ` Sverre Rabbelier
2008-07-29  5:08               ` Jeff King
2008-07-29  6:35                 ` 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

  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=e2b179460807290236k214b41f2wee25c213d7c95ae3@mail.gmail.com \
    --to=mike.ralphson@gmail.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=peff@peff.net \
    --cc=sverre@rabbelier.nl \
    --cc=vmiklos@frugalware.org \
    /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).