Hi James,
On Sun, 10 Aug 2008 22:53:18 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>
wrote:
>
> On Fri, 8 Aug 2008 19:23:11 +1000 (EST) James Morris <jmorris@xxxxxxxxx>
> wrote:
> >
> > I'm not 100% clear on the new process.
> >
> > What happens with your fixup patch? Is this something you maintain in
> > your tree from now until these trees are merged with Linus? (At which
> > point we'll run into the same conflicts again ?)
>
> I redo the conflict fixup (well, "git rerere" usually does it for me)
> each day, and by the time the tree gets merged by Linus, he will either
> fix the conflict as well, or somewhere along the way it gets taken care
> of by the owner of one of the trees by doing a merge or rebase against
> Linus' tree after the other tree gets merged.
>
> Or sometimes we do a temporary form of an API change so that other trees
> can do the API change early and thus remove the conflict.
>
> There is nothing official about this procedure, I am just trying to make
> things easier by noticing possible problems early.
Of course build (and runtime) bugs are a different matter and should be
fixed as soon as possible.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
-- Attached file included as plaintext by Ecartis --
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
iEYEARECAAYFAkie69MACgkQjjKRsyhoI8wOOACgs45XWB8U9Swau1Nl3nFIOMk/
7vIAn2d8+pJAmw+NnP5z+65A/hyGlLEk
=veql
-----END PGP SIGNATURE-----
|