all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Stephen J. Turnbull" <stephen@xemacs.org>
To: Andreas Schwab <schwab@suse.de>
Cc: Barry Warsaw <barry@python.org>, emacs-devel@gnu.org
Subject: Re: Messing with the VC history
Date: Wed, 19 Nov 2014 07:30:41 +0900	[thread overview]
Message-ID: <874mtwuooe.fsf@uwakimon.sk.tsukuba.ac.jp> (raw)
In-Reply-To: <mvmfvdgxwte.fsf@hawking.suse.de>

Andreas Schwab writes:
 > Barry Warsaw <barry@python.org> writes:
 > 
 > > bisect would be more useful, IMHO, if it followed first-parents by default.
 > 
 > Bisecting follows whatever you tell it about the good/bad state of
 > branches.

No, bisecting has a choice of which of several paths to follow through
a DAG between a branch point and a merge.  Telling it "bisect between
node and merge" doesn't help it make that choice.

I don't know how git chooses, but Barry is saying that in a workflow
where all mainline commits are either merge commits (for multiple-
commit "complex feature" branches) or one-off (for "simple bugfix"
commits), the bisect algorithm should follow the mainline (ie, first
parents) and completely ignore off-mainline "component of feature"
commits.  I suspect that is in fact what git does, but don't have time
to check.





  reply	other threads:[~2014-11-18 22:30 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-11-16  6:17 Messing with the VC history Óscar Fuentes
2014-11-16  8:19 ` Achim Gratz
2014-11-16 15:25   ` Eli Zaretskii
2014-11-16 16:00     ` David Engster
2014-11-17 16:48       ` Eli Zaretskii
2014-11-16 16:33     ` Achim Gratz
2014-11-16 18:13       ` Eli Zaretskii
2014-11-22 10:04         ` Steinar Bang
2014-11-16 15:24 ` Eli Zaretskii
2014-11-16 16:05   ` Óscar Fuentes
2014-11-16 16:21     ` Eli Zaretskii
2014-11-16 23:33     ` Stephen J. Turnbull
2014-11-17  1:31       ` John Yates
2014-11-17  3:23         ` Stephen J. Turnbull
2014-11-18  7:18           ` Lars Brinkhoff
2014-11-18  7:42             ` David Kastrup
2014-11-18  7:53             ` Stephen J. Turnbull
2014-11-18  8:41               ` David Kastrup
2014-11-18 16:47               ` Barry Warsaw
2014-11-18 17:06                 ` Andreas Schwab
2014-11-18 22:30                   ` Stephen J. Turnbull [this message]
2014-11-19  2:34                     ` Stefan Monnier
2014-11-17 16:42       ` Eli Zaretskii

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=874mtwuooe.fsf@uwakimon.sk.tsukuba.ac.jp \
    --to=stephen@xemacs.org \
    --cc=barry@python.org \
    --cc=emacs-devel@gnu.org \
    --cc=schwab@suse.de \
    /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 external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

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.