First let me describe my goal: I am trying to get UML working with the
recent 2.5.x versions. Currently, the most recent UML patch for 2.5 is
against 2.5.2-pre11.
What I have done is clone'd http://linux.bkbits.net/linux-2.5 and then cloned
that to a working repository. When I cloned I used -r1.157, which is the
revision 2.5.2-pre11 was. I then apply the UML patch with bk import. My
next step would be to go to rev 1.158 and make sure everything works.
Provided everything is OK at that step, I would go to the next rev and repeat.
So far I have found two ways to get from 1.157 to 1.158. One is to pull from
the parent and then undo down to 1.158. The only other way that has been
suggested to me is to pull 1.158 in parallel and then import the patch there.
I have only tried the former with little to no success thus far. For one
thing the trees are sparse after I've cloned them, which IIRC is related to
BK's mode of operation. After a bk -r co -q the tree seems to be properly
populated. Secondly, undoing a revision also undoes any imported patches.
Finally, sometimes BK has refused to do anything when there are extra files
lying around. None of these things are flaws in BK, just indicative of my
misunderstanding of the tool.
The second method I deem unusable because 1) BK operations are extremely slow
on my machine (dual p2/400 256 MB ram) and 2) would be extremely wasteful of
diskspace to have lots of trees laying around (?).
I have read much of the documentation including the user guide, the website
tutorial, the reference guide and much of the help documentation and the
solution to my problem is not apparent. resync seemed to be the closest to
what I want but it is only useful when creating a repository.
So, does anyone have any suggestions on how to update revision by revision
while keeping patches applied?
Thanks in advance,
--
akk~
On Sat, Mar 16, 2002 at 06:54:00PM -0600, Adam Keys wrote:
>
> So far I have found two ways to get from 1.157 to 1.158. One is to pull from
> the parent and then undo down to 1.158. The only other way that has been
> suggested to me is to pull 1.158 in parallel and then import the patch there.
If you have a clone of the full master 2.5 repository somewhere on
your harddisk, you can go just there and do a
% bk send -r1.158 - | bk receive /your/uml/repository
After that change to your uml repository and do a
% bk resolve
to apply the 1.158 changeset to your uml repository (if you give a
"-a" option to bk receive, bk resolve will be run automatically).
Andreas
--
Andreas Ferber - dev/consulting GmbH - Bielefeld, FRG
---------------------------------------------------------
+49 521 1365800 - [email protected] - http://www.devcon.net
On March 16, 2002 08:15, Andreas Ferber wrote:
> If you have a clone of the full master 2.5 repository somewhere on
> your harddisk, you can go just there and do a
>
> % bk send -r1.158 - | bk receive /your/uml/repository
>
> After that change to your uml repository and do a
>
> % bk resolve
>
> to apply the 1.158 changeset to your uml repository (if you give a
> "-a" option to bk receive, bk resolve will be run automatically).
This looks like exactly what I need! Except, the following is something I
don't need:
bk: slib.c:11283: sccs_getInit: Assertion `e' failed.
I ran the bk send command exactly as above. Is this a known bug?
--
akk~
On March 16, 2002 08:49, Adam Keys wrote:
> This looks like exactly what I need! Except, the following is something I
> don't need:
>
> bk: slib.c:11283: sccs_getInit: Assertion `e' failed.
More specifically, this happens when bk receive is run
$ bk version
BitKeeper/Free version is bk-2.1.4b 20020208233540 for x86-glibc22-linux
Built by: [email protected] in /build/bk-2.1.x-lm/src
Built on: Fri Feb 8 16:37:41 PST 2002
--
akk~
On Sat, Mar 16, 2002 at 06:54:00PM -0600, Adam Keys wrote:
> First let me describe my goal: I am trying to get UML working with the
> recent 2.5.x versions. Currently, the most recent UML patch for 2.5 is
> against 2.5.2-pre11.
>
> What I have done is clone'd http://linux.bkbits.net/linux-2.5 and then cloned
> that to a working repository. When I cloned I used -r1.157, which is the
> revision 2.5.2-pre11 was. I then apply the UML patch with bk import. My
> next step would be to go to rev 1.158 and make sure everything works.
> Provided everything is OK at that step, I would go to the next rev and repeat.
You can do that and it will take a while because you have to port forward
to each step. Why not just patch it in at 1.157 and then pull again to
pull it all the way forward?
Anyway, to do what you asked, here's what I'd do:
bk clone bk://linux.bkbits.net/linux-2.5
bk clone -lr1.157 linux-2.5 2.5.2-pre11
bk import -tpatch ....
bk clone -lr1.158 linux-2.5 next
bk pull
repeat
--
---
Larry McVoy lm at bitmover.com http://www.bitmover.com/lm