From: Larry McVoy <lm@bitmover.com>
To: Rik van Riel <riel@conectiva.com.br>
Cc: Larry McVoy <lm@bitmover.com>,
Marcelo Tosatti <marcelo@conectiva.com.br>,
Jeff Garzik <jgarzik@mandrakesoft.com>,
Christoph Hellwig <hch@caldera.de>,
hpa@kernel.org, linux-kernel@vger.kernel.org
Subject: Re: Linux 2.4 bitkeeper repository
Date: Fri, 22 Feb 2002 11:45:22 -0800 [thread overview]
Message-ID: <20020222114522.G7909@work.bitmover.com> (raw)
In-Reply-To: <20020222104232.D28253@work.bitmover.com> <Pine.LNX.4.33L.0202221634230.7820-100000@imladris.surriel.com>
In-Reply-To: <Pine.LNX.4.33L.0202221634230.7820-100000@imladris.surriel.com>; from riel@conectiva.com.br on Fri, Feb 22, 2002 at 04:37:27PM -0300
On Fri, Feb 22, 2002 at 04:37:27PM -0300, Rik van Riel wrote:
> On Fri, 22 Feb 2002, Larry McVoy wrote:
>
> > On Fri, Feb 22, 2002 at 02:36:39PM -0200, Marcelo Tosatti wrote:
> > > As soon as I have time, I'll learn BK and maintain the repository myself.
>
> > Also, if you want, one of us can get on IRC while you are walking the
> > demo and answer your questions.
>
> I've already promised marcelo to setup some repositories,
> one with Jeff's marcelo-2.4 tree and a few with patches
> to merge into 2.4.
>
> Then I'll walk marcelo through the process of merging
> patches with bitkeeper (or rather, letting bitkeeper take
> care of that stuff) and generally making marcelo familiar
> with the important bitkeeper commands and some external
> scripts.
The main thing is that you need to watch out for renames in patches.
bk import -tpatch handles that, straight patch does not. If you don't
catch the renames life will suck because one file will be deleted in
your tree but may not be deleted yet in another tree. If someone else
is working on the old tree and you pull from them, their updates will
go to the deleted file. They are there, but pretty useless if you
wanted them in the file with the new name.
We need to tweak stuff so that you can use bk import -temail or something
like that and it's a combination of Linus' scripts and the current code.
Linus? Scripts?
--
---
Larry McVoy lm at bitmover.com http://www.bitmover.com/lm
next prev parent reply other threads:[~2002-02-22 19:46 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-02-22 15:06 Linux 2.4 bitkeeper repository Christoph Hellwig
2002-02-22 15:13 ` Jeff Garzik
2002-02-22 15:26 ` DevilKin
2002-02-22 15:40 ` Jeff Garzik
2002-02-22 15:44 ` Stelian Pop
2002-02-22 16:36 ` Marcelo Tosatti
2002-02-22 18:42 ` Larry McVoy
2002-02-22 19:37 ` Rik van Riel
2002-02-22 19:45 ` Larry McVoy [this message]
2002-02-23 19:40 ` Linus Torvalds
2002-02-22 16:53 ` Larry McVoy
2002-02-22 19:26 ` Rik van Riel
2002-02-22 19:37 ` Tom Rini
2002-02-22 19:49 ` Rik van Riel
2002-02-23 0:35 ` Tom Rini
2002-02-23 1:32 ` Larry McVoy
2002-02-23 1:46 ` Davide Libenzi
2002-02-23 1:58 ` Larry McVoy
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=20020222114522.G7909@work.bitmover.com \
--to=lm@bitmover.com \
--cc=hch@caldera.de \
--cc=hpa@kernel.org \
--cc=jgarzik@mandrakesoft.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marcelo@conectiva.com.br \
--cc=riel@conectiva.com.br \
/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