[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Monotone-devel] current CVS import status
|
From: |
Christof Petig |
|
Subject: |
Re: [Monotone-devel] current CVS import status |
|
Date: |
Mon, 26 Apr 2004 12:32:06 +0200 |
|
User-agent: |
Mozilla/5.0 (X11; U; Linux ppc; de-AT; rv:1.6) Gecko/20040414 Debian/1.6-5 |
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
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?
Christof