Re: [Monotone-devel] new ssh branch, success!

[Nathaniel Smith]

On Sat, Nov 20, 2004 at 05:20:13PM +0100, Christof Petig wrote:
> Christof Petig schrieb:
> I commited a fix to rev 2e0d044463ade95d106611197c09ce5c35cbfcee 
> (monotone.sqlite3 branch - resistance is futile).
> 
> Anybody cares to explain how to propagate the changeset 
> c9647a0d26e55572ce34cbf34644cd7eaeef6010 -> 
> 2e0d044463ade95d106611197c09ce5c35cbfcee to the ssh head 
> (6a5a7ef7e6d53e2f22918f099ec03963f1cbb090)

You can't, really; using 'patch' is the only way.  I think the moral
is, if you're working on two independent changes on two different
branches, don't mix them all up in history... just branch each off the
mainline independently.

(Well, I guess in theory one might add some clever way to reverse
changesets or something, like in A -> B -> C merge A and C using B as
the common ancestor, but... this just gives you a "better patch", one
that uses merge3 and can track renames etc., you're still not going to
be able to record the history right afterwards.)

-- Nathaniel

-- 
Details are all that matters; God dwells there, and you never get to
see Him if you don't struggle to get them right. -- Stephen Jay Gould