Thread (11 messages) 11 messages, 5 authors, 2006-07-17

Re: how to get individual patches

From: Grant Likely <hidden>
Date: 2006-07-14 18:22:11

On 7/14/06, David H. Lynch Jr. [off-list ref] wrote:
     Thank You git bisect has proven to be incredibly interesting.

     One question/problem - maybe an incomplete understanding of git.

     What I need to do is get to some version of 2.6.16 - as they all work
for me.

     cut in my patches.

     And THEN start bisecting while retaining my patches.

     Is that going to work or am I going to have to repatch each time ?
AFAIK, yes you will have to repatch every time; I typically write a
little helper script to lessen the pain:

git bisect good|bad # depends on whether it works or not
patch < [patchfile]
compile, test, etc
cg restore -f     # Remove the patches
git bisect good|bad   # lather, rinse, repeate
     Basically can I use git to insert a patch into the middle of its delta
history and then advance forward from there ?
I don't think so; no automatically; but if you don't commit your
changes then it's easy to drop the change the patch makes.

git-rebase does something similar to what you're trying to do; but
it's complex to use (especially if there are conflicts) and might
conflict w/ the git-bisect tool
     It is rapidly becoming obvious that competence with git could have big
payback.
:)

Cheers,
g.

-- 
Grant Likely, B.Sc. P.Eng.
Secret Lab Technologies Ltd.
grant.likely@secretlab.ca
(403) 399-0195
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help