Re: [Monotone-devel] current CVS import status

[Nathaniel Smith]

On Mon, Apr 26, 2004 at 12:32:06PM +0200, Christof Petig wrote:
> Christof Petig schrieb:
> >PS: I will take a look at address@hidden's fixes and most likely 
> >authorize them. Then we'll nicely see how well monotone handles real 
> >distributed parralel development.
> 
> 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."

> Look up common ancestor 6dcb42a98c752666c8728ab4d36456b6db9f7a46
> 
> monotone diff 6dcb42a98c752666c8728ab4d36456b6db9f7a46 
> aa716ba0e805243b5f9d647bc7be158bdf7aca65 > /tmp/patch
> 
> patch < /tmp/patch
> 
> Correct conflicts in ChangeLog by hand, commit.
> 
> monotone cert manifest d286dfc7a2c02c2adb4024cd3ea84b8a01df211c ancestor 
> aa716ba0e805243b5f9d647bc7be158bdf7aca65
> 
> 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.

-- Nathaniel

-- 
- Don't let your informants burn anything.
- Don't grow old.
- Be good grad students.
  -- advice of Murray B. Emeneau on the occasion of his 100th birthday