Skip to contentSkip to conversation

Linux 2.4 bitkeeper repository

DISCUSSION Christoph Hellwig 10 participants 18 messages Feb 22, 2002 – Feb 23, 2002

lore
Share & tools
lore
#0 lore raw

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

Signature · 1 line
Of course it doesn't work. We've performed a software upgrade.
#1 lore raw
Quoted 10 lines · 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?).

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 :)

Quoted 2 lines

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

Signature · 3 lines
Jeff Garzik      | "UNIX enhancements aren't."
Building 1024    |           -- says /usr/games/fortune
MandrakeSoft     |
#7 lore raw
In reply to Christoph Hellwig
Quoted 19 lines · Jeff Garzik
Quoted 9 lines · 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?).

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.

Quoted 7 lines

In general, though, agreed :)

Quoted 2 lines

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)

Quoted 5 lines

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

Jeff

DK

#8 lore raw
In reply to Christoph Hellwig
Quoted 7 lines · DevilKin
Quoted 2 lines · Jeff Garzik

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.

Signature · 3 lines
Jeff Garzik      | "UNIX enhancements aren't."
Building 1024    |           -- says /usr/games/fortune
MandrakeSoft     |
#10 lore raw
In reply to Christoph Hellwig
Quoted 6 lines · 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?

Quoted 6 lines

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.

Signature · 2 lines
---
Larry McVoy            	 lm at bitmover.com           http://www.bitmover.com/lm 
#2 lore raw
In reply to Jeff Garzik
Quoted 12 lines · Jeff Garzik
Quoted 10 lines · 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?).

Quoted 7 lines

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.

#3 lore raw
In reply to Jeff Garzik
Quoted 1 line · Marcelo Tosatti

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.

Signature · 2 lines
---
Larry McVoy            	 lm at bitmover.com           http://www.bitmover.com/lm 
#11 lore raw
In reply to Christoph Hellwig
Quoted 10 lines · Christoph Hellwig

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

Signature · 4 lines
"Linux holds advantages over the single-vendor commercial OS"
    -- Microsoft's "Competing with Linux" document

http://www.surriel.com/		http://distro.conectiva.com/
#4 lore raw
In reply to Larry McVoy
Quoted 5 lines · Larry McVoy
Quoted 1 line · Marcelo Tosatti

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

Signature · 4 lines
"Linux holds advantages over the single-vendor commercial OS"
    -- Microsoft's "Competing with Linux" document

http://www.surriel.com/		http://distro.conectiva.com/
#12 lore raw
In reply to Christoph Hellwig
Quoted 10 lines · Rik van Riel
Quoted 8 lines · Christoph Hellwig

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?).

Quoted 7 lines
Quoted 2 lines

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.

Signature · 2 lines
Tom Rini (TR1265)
http://gate.crashing.org/~trini/
#5 lore raw
In reply to Larry McVoy
Quoted 12 lines · Rik van Riel
Quoted 5 lines · Larry McVoy
Quoted 1 line · Marcelo Tosatti

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.

Quoted 5 lines

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?

Signature · 2 lines
---
Larry McVoy            	 lm at bitmover.com           http://www.bitmover.com/lm 
#13 lore raw
In reply to Tom Rini
Quoted 3 lines · Tom Rini

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

Signature · 4 lines
"Linux holds advantages over the single-vendor commercial OS"
    -- Microsoft's "Competing with Linux" document

http://www.surriel.com/		http://distro.conectiva.com/
#14 lore raw
In reply to Tom Rini
Quoted 8 lines · Rik van Riel
Quoted 3 lines · Tom Rini

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.

Signature · 2 lines
Tom Rini (TR1265)
http://gate.crashing.org/~trini/
#15 lore raw
In reply to Tom Rini
Quoted 5 lines · Tom Rini
Quoted 2 lines

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.

Signature · 2 lines
---
Larry McVoy            	 lm at bitmover.com           http://www.bitmover.com/lm 
#16 lore raw
Quoted 7 lines · Larry McVoy
Quoted 5 lines · Tom Rini
Quoted 2 lines

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.

Quoted 7 lines

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

#17 lore raw
In reply to Larry McVoy
Quoted 2 lines · Davide Libenzi

Larry, i've a question for you.
Does BK use the same basic algos of diff+patch ?

Absolutely not.

Quoted 2 lines

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.

Signature · 2 lines
---
Larry McVoy            	 lm at bitmover.com           http://www.bitmover.com/lm 
#6 lore raw
In reply to Larry McVoy

In article <[email protected]>,

Quoted 3 lines · Larry McVoy

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