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

Karl Hasselström [off-list ref] writes:

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

quoted

Karl Hasselström [off-list ref] writes:

quoted

-directly). For standard SCM operations, either use plain GIT commands
-or the Cogito tool but it is not recommended to mix them with the
-StGIT commands.
+directly). For standard SCM operations, use plain GIT commands.

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).

Don't forget your new assimilate implementation.

-- 
David Kågedal

On 2007-11-05 13:21:13 +0100, David Kågedal wrote:

Don't forget your new assimilate implementation.

That's in Catalin's master branch already, so there can't possibly be
a release that has this patch and not the assimilate improvements. But
yes, that's what makes it possible to easily recover from just about
anything the git commands can do.

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