From: Tom Rini <trini@kernel.crashing.org>
To: David Woodhouse <dwmw2@infradead.org>
Cc: Larry McVoy <lm@bitmover.com>,
Jeff Garzik <jgarzik@mandrakesoft.com>,
James Bottomley <James.Bottomley@SteelEye.com>,
linux-kernel@vger.kernel.org
Subject: Re: Problems using new Linux-2.4 bitkeeper repository.
Date: Mon, 18 Mar 2002 08:25:12 -0700 [thread overview]
Message-ID: <20020318152512.GE3762@opus.bloom.county> (raw)
In-Reply-To: <20020316083059.A10086@work.bitmover.com> <3C9375B7.3070808@mandrakesoft.com> <20020316085213.B10086@work.bitmover.com> <3C937B82.60500@mandrakesoft.com> <20020316091452.E10086@work.bitmover.com> <3C938027.4040805@mandrakesoft.com> <30393.1016362174@redhat.com> <20020317075443.A15420@work.bitmover.com> <16049.1016382201@redhat.com> <23384.1016390069@redhat.com>
On Sun, Mar 17, 2002 at 06:34:29PM +0000, David Woodhouse wrote:
>
> lm@bitmover.com said:
> > Then you get to save them as diffs, unedit the files, and put them
> > back after the merge.
>
> I can do better than that. If I save them as diffs, I don't get to use your
> cute merge tools. I could commit them with a throwaway changelog, do the
> pull and use the merge tools, then copy the resulting files, undo both the
> pull and the previous merge, do the pull again and then lock the files and
> drop the previously-saved copies into place.
Well, what we're doing in PPC-land is we've got one tree, 'linuxppc-2.5'
which is linux-2.5 + for-linus-ppc* trees + hacks/fixes for current
problems. So when we do any work you make a clone of a linux-2.5 tree
to work in, a clone of the linuxppc-2.5 tree (to pull your work tree
into and then test). Once things are good in the linux-2.5-work tree,
you pull that into a for-linus tree and tell linus to merge that.
--
Tom Rini (TR1265)
http://gate.crashing.org/~trini/
next prev parent reply other threads:[~2002-03-18 15:26 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-03-15 2:38 Problems using new Linux-2.4 bitkeeper repository James Bottomley
2002-03-15 4:55 ` Jeff Garzik
2002-03-16 16:08 ` James Bottomley
2002-03-16 16:28 ` Jeff Garzik
2002-03-16 16:30 ` Larry McVoy
2002-03-16 16:41 ` Jeff Garzik
2002-03-16 16:52 ` Larry McVoy
2002-03-16 17:06 ` Jeff Garzik
2002-03-16 17:14 ` Larry McVoy
2002-03-16 17:25 ` Jeff Garzik
2002-03-16 17:38 ` Larry McVoy
2002-03-16 17:51 ` Jeff Garzik
2002-03-16 18:31 ` Christer Weinigel
2002-03-16 18:05 ` Jeff Garzik
2002-03-16 19:01 ` Larry McVoy
2002-03-16 19:44 ` Jeff Garzik
2002-03-17 10:49 ` David Woodhouse
2002-03-17 15:54 ` Larry McVoy
2002-03-17 16:23 ` David Woodhouse
2002-03-17 18:15 ` Larry McVoy
2002-03-17 18:34 ` David Woodhouse
2002-03-18 15:25 ` Tom Rini [this message]
2002-03-16 17:17 ` James Bottomley
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=20020318152512.GE3762@opus.bloom.county \
--to=trini@kernel.crashing.org \
--cc=James.Bottomley@SteelEye.com \
--cc=dwmw2@infradead.org \
--cc=jgarzik@mandrakesoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lm@bitmover.com \
/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