From: David Ho <davidkwho@gmail.com>
Date: Fri, 31 Mar 2006 22:03:45 GMT
Subject: Re: Moving a file back to an earlier revision.
Message-ID: <4dd15d180603311403o1f78ee56j707346e887463168@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.64.0603311324040.27203@g5.osdl.org>

On 3/31/06, Linus Torvalds <torvalds@osdl.org> wrote:
> Don't revert.
>
> Just pick the point you want to start testing his patch at (with gitk, for
> example, just cut-and-paste the sha1), and do
>
>         git checkout -b test-better-fix <sha1>
>
> which creates a new branch ("test-better-fix") that starts at that point,
> and checks it out.

I forget to mention I have also in my branch changes necessary to run
on my board.  So what I did was

git-branch test-better-fix my-branch
git-checkout test-better-fix
git-diff commit(my-fixes)..commit(original) filename | git-apply
git-commit

>
> Then, just apply the patch, and off you go. You now have _both_ his patch
> and your own series in separate branches, so you can cherry-pick and do
> other things (like do a "diff" between branches - which can sometimes be
> useful too to verify that the two branches end up fixing all the same
> problems).
>

Yes, good point.

Thanks, David