Re: Linux-2.5.8-pre1

[Larry McVoy]

On Sat, Apr 06, 2002 at 04:36:47PM +0100, David Woodhouse wrote:
> 
> [e-mail] said:
> > With Marcelo using bk these days, is it possible that you can cherry
> > pick certain csets from his bk tree ?
> 
> I couldn't work out how to make BK even attempt that. 
> 
> If you commit harmless and irrelevant changeset 'X' to a repository, then 
> commit a completely separate changeset 'Y' which doesn't touch any of the 
> same files, then it seems to be impossibleš to import 'Y' into a different 
> tree without also importing 'X'.

If you want to do it preserving all the BK info, i.e., a pull with some
option to send a particular changeset, that doesn't work.  BK has an 
invariant which is that the parent of any changeset you send must be
present in the receiving repository or it won't work.

What you want to do is cherrypick, to do that with BK you have two choices:
    a) wait for LODs
    b) export as a patch and import as a patch.
The second one works fine but causes problems over the long run, especially
with file creates.