git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: walt <w41ter@gmail.com>
To: git@vger.kernel.org
Subject: Bisecting through the middle of a big merge?
Date: Fri, 27 Jan 2012 16:03:20 -0800	[thread overview]
Message-ID: <jfve09$ih5$1@dough.gmane.org> (raw)

My problem is that I lack a good mental model of what git does
when it commits a big merge, and so I get lost when I try to
bisect back through a merge.  (I'm a tester, not a developer.)

This specific recent example is causing me problems:

Merge: b3c9dd1 85a0f7b
Author: Linus Torvalds
Date:   Sun Jan 15 12:48:41 2012 -0800
    Merge branch 'for-3.3/drivers' of git://git.kernel.dk/linux-block

There are many individual commits from Tejun Heo et al included
in that one big commit from Linus.  Unfortunately for me, some of
those commits cause other problems that I'm not trying to bisect;
other problems that evidently get fixed by other commits in the
same big merge.

So I do 'git bisect skip' six or eight times until the 'false' bug
goes away, and that leaves me at the end of the bisect without finding
the individual commit that's causing my 'real' bug.

How do you experts handle this kind of problem?

Thanks for any clues.

             reply	other threads:[~2012-01-28  0:04 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-28  0:03 walt [this message]
2012-01-28  8:55 ` Bisecting through the middle of a big merge? Andreas Schwab
2012-01-28 18:15   ` walt
2012-01-28 19:47     ` Andreas Schwab
2012-01-28 22:18       ` walt

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='jfve09$ih5$1@dough.gmane.org' \
    --to=w41ter@gmail.com \
    --cc=git@vger.kernel.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.
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 NNTP newsgroup(s).