Re: [Monotone-devel] current CVS import status

[Nathaniel Smith]

On Tue, Apr 27, 2004 at 09:08:59AM +0200, Christof Petig wrote:
> Nathaniel schrieb:
> >>Christof Petig schrieb:
> >>I did not find a command for merging the active head with a part of 
> >>another head. [Is that what is called cherrypicking?] So I fell back to
> >
> >
> >No, cherrypicking would be if you have manifests A, B, and C, and you
> >apply diff(A, B) to C.  "I want that fix over there, please."
> 
> Cherrypicking would solve this task, too. Actually I tried to apply one 
> changeset (manifest diff) from one head on a different head.
> 
> So I wanted to apply diff(A,B) to C, that C is also a descendant of A is 
> a special case here. This special case might cause different "correct" 
> ancestry graphs though.

Right, my description wasn't as clear as it could be.  The interesting
part about cherrypicking is that A is not a common ancestor of B and
C, so it's not clear what to do with the ancestry graph.  What you
wanted was just a standard merge, where the ancestry graph is clear.

> >>Is there any more decent way to accomplish this?
> >
> >
> >Not at the moment.  It's an obvious hole in the UI that you can't
> >pass 'merge' two manifest ids and have it merge just those two.
> 
> Should I file a bug?

Sure.

-- Nathaniel

-- 
"The problem...is that sets have a very limited range of
activities -- they can't carry pianos, for example, nor drink
beer."