Messages in this thread | | | Subject | Re: Problems using new Linux-2.4 bitkeeper repository. | Date | Sat, 16 Mar 2002 11:08:32 -0500 | From | James Bottomley <> |
| |
jgarzik@mandrakesoft.com said: > Through the magic of BK :)
> Just do a 'bk pull' on my marcelo-2.4 tree. Since it is based on the > original linux-2.4 tree just like Marcelo's tree, I was able to merge > from my 2.4 line to his 2.4 line.
Well, I tried this, but it just gave me a slew of initial rename conflicts. It could be something to do with the fact that my base development is still on 2.4.18 (so the ancestors are easier to manage).
I finally solved it by writing a script to backport a bitkeeper change set to an earlier ancestor while preserving the change logs. This is going to be helpful taking change sets between 2.4 and 2.5 anyway.
Thanks,
James
- 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/
| |