Linux 2.4 bitkeeper repository

Linux 2.4 bitkeeper repository

[Christoph Hellwig]

Hi Larry & Peter,

the Linux 2.4 repository at linux.bkbbits.net is orphaned short after
it got created.  Ist there any chance we could see continguous checkins
for it?

I think it might be a good idea to get it automatically checked in once
Marcelo uploads a new (pre-) patch as part of the kernel.org
notification procedure (is this possible, Peter?).

If there is no way to automate it I would volunteer to do the checkins,
but for that I'd need write permissions to the repository.

	Christoph

-- 
Of course it doesn't work. We've performed a software upgrade.

Re: Linux 2.4 bitkeeper repository

[Jeff Garzik]

Christoph Hellwig wrote:
> 
> Hi Larry & Peter,
> 
> the Linux 2.4 repository at linux.bkbbits.net is orphaned short after
> it got created.  Ist there any chance we could see continguous checkins
> for it?
> 
> I think it might be a good idea to get it automatically checked in once
> Marcelo uploads a new (pre-) patch as part of the kernel.org
> notification procedure (is this possible, Peter?).

Stuff will start showing up on kernel.org presumeably when BitMover
works out how to do proper locking on a repository without giving
'other' and 'group' write permission.

I presume one can pretty easily set up a cron to do that... but I wonder
if it is ok with Marcelo?  If Marcelo has plans for that repository, we
ought not touch it probably.

In general, though, agreed :)

> If there is no way to automate it I would volunteer to do the checkins,
> but for that I'd need write permissions to the repository.

As a temporary measure people can pull from
	http://gkernel.bkbits.net/marcelo-2.4

which is always up-to-date with the latest Marcelo pre-patch, and
contains nothing else.

	Jeff



-- 
Jeff Garzik      | "UNIX enhancements aren't."
Building 1024    |           -- says /usr/games/fortune
MandrakeSoft     |

Re: Linux 2.4 bitkeeper repository

[DevilKin]

On Friday 22 February 2002 16:13, Jeff Garzik wrote:
> Christoph Hellwig wrote:
> > Hi Larry & Peter,
> >
> > the Linux 2.4 repository at linux.bkbbits.net is orphaned short after
> > it got created.  Ist there any chance we could see continguous checkins
> > for it?
> >
> > I think it might be a good idea to get it automatically checked in once
> > Marcelo uploads a new (pre-) patch as part of the kernel.org
> > notification procedure (is this possible, Peter?).
>
> Stuff will start showing up on kernel.org presumeably when BitMover
> works out how to do proper locking on a repository without giving
> 'other' and 'group' write permission.
>
> I presume one can pretty easily set up a cron to do that... but I wonder
> if it is ok with Marcelo?  If Marcelo has plans for that repository, we
> ought not touch it probably.
>
> In general, though, agreed :)
>
> > If there is no way to automate it I would volunteer to do the checkins,
> > but for that I'd need write permissions to the repository.
>
> As a temporary measure people can pull from
> 	http://gkernel.bkbits.net/marcelo-2.4

Corrected URL: http://gkernel.bkbits.net:8080/marcelo-2.4

(you forgot the BK port, Jeff)

>
> which is always up-to-date with the latest Marcelo pre-patch, and
> contains nothing else.
>
> 	Jeff

DK

Re: Linux 2.4 bitkeeper repository

[Jeff Garzik]

DevilKin wrote:
> On Friday 22 February 2002 16:13, Jeff Garzik wrote:
> > As a temporary measure people can pull from
> >       http://gkernel.bkbits.net/marcelo-2.4
> 
> Corrected URL: http://gkernel.bkbits.net:XXXX/marcelo-2.4
> 
> (you forgot the BK port, Jeff)


nope, "bk pull http://gkernel.bkbits.net/marcelo-2.4" or "bk clone ..."
works just fine without the port.


-- 
Jeff Garzik      | "UNIX enhancements aren't."
Building 1024    |           -- says /usr/games/fortune
MandrakeSoft     |

Re: Linux 2.4 bitkeeper repository

[Stelian Pop]

On Fri, Feb 22, 2002 at 04:26:38PM +0100, DevilKin wrote:

> > As a temporary measure people can pull from
> > 	http://gkernel.bkbits.net/marcelo-2.4
> 
> Corrected URL: http://gkernel.bkbits.net:8080/marcelo-2.4
> 
> (you forgot the BK port, Jeff)

He didn't, both ports are correct.

Stelian.
-- 
Stelian Pop <stelian.pop@fr.alcove.com>
Alcove - http://www.alcove.com

Re: Linux 2.4 bitkeeper repository

[Marcelo Tosatti]

On Fri, 22 Feb 2002, Jeff Garzik wrote:

> Christoph Hellwig wrote:
> > 
> > Hi Larry & Peter,
> > 
> > the Linux 2.4 repository at linux.bkbbits.net is orphaned short after
> > it got created.  Ist there any chance we could see continguous checkins
> > for it?
> > 
> > I think it might be a good idea to get it automatically checked in once
> > Marcelo uploads a new (pre-) patch as part of the kernel.org
> > notification procedure (is this possible, Peter?).
> 
> Stuff will start showing up on kernel.org presumeably when BitMover
> works out how to do proper locking on a repository without giving
> 'other' and 'group' write permission.
> 
> I presume one can pretty easily set up a cron to do that... but I wonder
> if it is ok with Marcelo?  If Marcelo has plans for that repository, we
> ought not touch it probably.

As soon as I have time, I'll learn BK and maintain the repository myself.

Re: Linux 2.4 bitkeeper repository

[Larry McVoy]

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.

A couple of useful resources are:

    http://www.bitkeeper.com/cvs2bk.html    
    http://www.bitkeeper.com/Test.html    
    http://news.linuxprogramming.com/news_story.php3?ltsn=2002-02-21-001-06-DT-HT
The last one is Jeff's writeup, very nice.

Also, if you want, one of us can get on IRC while you are walking the demo
and answer your questions.  
-- 
---
Larry McVoy            	 lm at bitmover.com           http://www.bitmover.com/lm 

Re: Linux 2.4 bitkeeper repository

[Rik van Riel]

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.

cheers,

Rik
-- 
"Linux holds advantages over the single-vendor commercial OS"
    -- Microsoft's "Competing with Linux" document

http://www.surriel.com/		http://distro.conectiva.com/

Re: Linux 2.4 bitkeeper repository

[Larry McVoy]

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 

Re: Linux 2.4 bitkeeper repository

[Linus Torvalds]

In article <20020222114522.G7909@work.bitmover.com>,
Larry McVoy  <lm@bitmover.com> wrote:
>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?

My scripts are on master.kernel.org:/home/torvalds/BK/tools, although I
haven't bothered to clean some of them up that really should be cleaned
up (things like email parsing that breaks on some emails due to MIME
and/or "^From " in the body etc). 

Those tools include all the scripts to make changelogs, apply patches
from emails etc.

And they require the recent bitkeeper that can take comments and user
information for "bk import -tpatch". 

(Yeah, "master" isn't an open machine, but Marcelo, Rik, Jeff etc can
all get in on it, if somebody wants to push the tools out somewhere else
they can certainly do so).

		Linus

Re: Linux 2.4 bitkeeper repository

[Larry McVoy]

On Fri, Feb 22, 2002 at 04:06:57PM +0100, Christoph Hellwig wrote:
> Hi Larry & Peter,
> 
> the Linux 2.4 repository at linux.bkbbits.net is orphaned short after
> it got created.  Ist there any chance we could see continguous checkins
> for it?
> 
> I think it might be a good idea to get it automatically checked in once
> Marcelo uploads a new (pre-) patch as part of the kernel.org
> notification procedure (is this possible, Peter?).
> 
> If there is no way to automate it I would volunteer to do the checkins,
> but for that I'd need write permissions to the repository.

I need to extract Linus' toolkit from him and integrate it into a BK 
release so you can do those nice patch imports he does.  Linus?  Can
you push your stuff to bitmover, I still don't have a working account
on master.kernel.org.
-- 
---
Larry McVoy            	 lm at bitmover.com           http://www.bitmover.com/lm 

Re: Linux 2.4 bitkeeper repository

[Rik van Riel]

On Fri, 22 Feb 2002, Christoph Hellwig wrote:

> the Linux 2.4 repository at linux.bkbbits.net is orphaned short after
> it got created.  Ist there any chance we could see continguous checkins
> for it?
>
> I think it might be a good idea to get it automatically checked in once
> Marcelo uploads a new (pre-) patch as part of the kernel.org
> notification procedure (is this possible, Peter?).
>
> If there is no way to automate it I would volunteer to do the checkins,
> but for that I'd need write permissions to the repository.

I've got a script here which pretty much automates the
checkins of incremental patches, it should be trivial
for Peter to call that from his script that creates the
incremental diffs.

regards,

Rik
-- 
"Linux holds advantages over the single-vendor commercial OS"
    -- Microsoft's "Competing with Linux" document

http://www.surriel.com/		http://distro.conectiva.com/

Re: Linux 2.4 bitkeeper repository

[Tom Rini]

On Fri, Feb 22, 2002 at 04:26:42PM -0300, Rik van Riel wrote:
> On Fri, 22 Feb 2002, Christoph Hellwig wrote:
> 
> > the Linux 2.4 repository at linux.bkbbits.net is orphaned short after
> > it got created.  Ist there any chance we could see continguous checkins
> > for it?
> >
> > I think it might be a good idea to get it automatically checked in once
> > Marcelo uploads a new (pre-) patch as part of the kernel.org
> > notification procedure (is this possible, Peter?).
> >
> > If there is no way to automate it I would volunteer to do the checkins,
> > but for that I'd need write permissions to the repository.
> 
> I've got a script here which pretty much automates the
> checkins of incremental patches, it should be trivial
> for Peter to call that from his script that creates the
> incremental diffs.

If you have a pristine tree, adding incremental diffs is:
bk import -tpatch ../patch-2.4.X-preY-preZ . && bk tag v2.4.X-preZ
Which is what I do for the PPC's kernel.org-only tree(s).

Larry or Cort Dougan came up w/ a script ages ago to do it w/o
incrmenetal diffs and to make a backup as well.

-- 
Tom Rini (TR1265)
http://gate.crashing.org/~trini/

Re: Linux 2.4 bitkeeper repository

[Rik van Riel]

On Fri, 22 Feb 2002, Tom Rini wrote:

> If you have a pristine tree, adding incremental diffs is:
> bk import -tpatch ../patch-2.4.X-preY-preZ . && bk tag v2.4.X-preZ
> Which is what I do for the PPC's kernel.org-only tree(s).

You forgot about setting the proper BK_USER, BK_HOST and
'bk comment' commands ;)

Rik
-- 
"Linux holds advantages over the single-vendor commercial OS"
    -- Microsoft's "Competing with Linux" document

http://www.surriel.com/		http://distro.conectiva.com/

Re: Linux 2.4 bitkeeper repository

[Tom Rini]

On Fri, Feb 22, 2002 at 04:49:07PM -0300, Rik van Riel wrote:
> On Fri, 22 Feb 2002, Tom Rini wrote:
> 
> > If you have a pristine tree, adding incremental diffs is:
> > bk import -tpatch ../patch-2.4.X-preY-preZ . && bk tag v2.4.X-preZ
> > Which is what I do for the PPC's kernel.org-only tree(s).
> 
> You forgot about setting the proper BK_USER, BK_HOST and
> 'bk comment' commands ;)

heh.  Those are rather new things, aren't they? :)  Anyhow, the goal for
these tree(s) is to keep the PPC children trees up to date.

-- 
Tom Rini (TR1265)
http://gate.crashing.org/~trini/

Re: Linux 2.4 bitkeeper repository

[Larry McVoy]

On Fri, Feb 22, 2002 at 05:35:13PM -0700, Tom Rini wrote:
> > You forgot about setting the proper BK_USER, BK_HOST and
> > 'bk comment' commands ;)
> 
> heh.  Those are rather new things, aren't they? :)  Anyhow, the goal for
> these tree(s) is to keep the PPC children trees up to date.

BK_USER, BK_HOST have been around forever but their use is discouraged for
the following reason: BK is a distributed system, we need unique names for
things, and the user&host are part of the name we make up.

bk comments is new and a darned useful thing, too, I'm glad Linus asked
for it.  You just have to read the man page and realize that your updates
to the comments may not propogate.
-- 
---
Larry McVoy            	 lm at bitmover.com           http://www.bitmover.com/lm 

Re: Linux 2.4 bitkeeper repository

[Davide Libenzi]

On Fri, 22 Feb 2002, Larry McVoy wrote:

> On Fri, Feb 22, 2002 at 05:35:13PM -0700, Tom Rini wrote:
> > > You forgot about setting the proper BK_USER, BK_HOST and
> > > 'bk comment' commands ;)
> >
> > heh.  Those are rather new things, aren't they? :)  Anyhow, the goal for
> > these tree(s) is to keep the PPC children trees up to date.
>
> BK_USER, BK_HOST have been around forever but their use is discouraged for
> the following reason: BK is a distributed system, we need unique names for
> things, and the user&host are part of the name we make up.
>
> bk comments is new and a darned useful thing, too, I'm glad Linus asked
> for it.  You just have to read the man page and realize that your updates
> to the comments may not propogate.

Larry, i've a question for you.
Does BK use the same basic algos of diff+patch ?
Or, if CVS fails a merge, what is the probability that BK will succeed on
the same op ?



- Davide

Re: Linux 2.4 bitkeeper repository

[Larry McVoy]

On Fri, Feb 22, 2002 at 05:46:54PM -0800, Davide Libenzi wrote:
> Larry, i've a question for you.
> Does BK use the same basic algos of diff+patch ?

Absolutely not.

> Or, if CVS fails a merge, what is the probability that BK will succeed on
> the same op ?

About 95% in our source base.  You can actually run a script over the
tree, and retry all the merges with the CVS alg and the BK alg.  The BK
alg automerges about 95% of the ones where CVS would not (could not).

These results are typical, in fact, the percentages go up as the number
of parallel developers go up.
-- 
---
Larry McVoy            	 lm at bitmover.com           http://www.bitmover.com/lm