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 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Sat Feb 23 2002 - 21:00:44 EST