Re: [StGit PATCH] Cogito is deprecated, so don't point to it

On 2007-11-05 13:00:14 +0100, Karl Hasselström wrote:

On 2007-11-05 10:57:17 +0100, Matthieu Moy wrote:

quoted

Doesn't the "but it is not recommended to mix them with the StGIT
commands." part still hold?

I'm not sure it ever held. Except possibly during merge resolution,
but that mismatch is going away with the patch series by David
Kågedal that's sitting in kha/experimental (which changes StGit to
use exactly the same conflict representation as git).

Mmm. Then there's of course the fact that if you use git commands to
change the branch ref (e.g. committing, resetting, and so on) you need
to run assimilate to deconfuse StGit. But it'll tell you so.

So I guess the (or at least my) conclusion is that we ought to have an
StGit User Manual where the user can learn these things, preferably
with examples and pretty DAG graphs. Half a sentence doesn't buy us
that much.

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle