git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Grégory Romé" <gregory.rome@maxim-ic.com>
To: git@vger.kernel.org
Subject: git bisect Vs branch
Date: Thu, 22 Oct 2009 17:48:59 +0200	[thread overview]
Message-ID: <4AE07EEB.2010101@maxim-ic.com> (raw)

Considering the following story what is the method to find the 
regression with bisect?

I cloned a git repository (origin) which derives from another one 
(first-origin). A merge is done from first-origin to origin at each 
stable release (identified by a tag).

first-origin/master  *---A---------B-----------------------C-
                          \         \                       \     
origin/master              ----------B'----------U-----------C'-
                                      \           \           \   
master                                 ------------U'----------C''-

Now, after that I merged C' I fixed the conflicts and compiled without 
error but I have a regression. It could come from any commit between B 
and C or U and C', and I need to modify my code to correct the issue.

I would like to find the commit which introduce this regression by using 
git bisect but as the history is not linear it is not so easy (1). It 
though to create a linear history but I have no idea how to proceed...

Thanks,
Grégory

(1) 
http://www.kernel.org/pub/software/scm/git/docs/user-manual.html#bisect-merges

             reply	other threads:[~2009-10-22 16:30 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-10-22 15:48 Grégory Romé [this message]
2009-10-22 16:50 ` git bisect Vs branch Santi Béjar
2009-10-23  7:09   ` Grégory Romé
2009-10-23  8:34     ` Johannes Sixt
2009-10-23  9:24       ` Grégory Romé
2009-10-23 16:31         ` Daniel Barkalow
2009-10-23 18:29     ` 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4AE07EEB.2010101@maxim-ic.com \
    --to=gregory.rome@maxim-ic.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).