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

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

[Karl Hasselström]

Signed-off-by: Karl Hasselström <kha@treskal.com>

---

Also available from

  git://repo.or.cz/stgit/kha.git safe

 README |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)


diff --git a/README b/README
index 0e648f5..4f20154 100644
--- a/README
+++ b/README
@@ -6,9 +6,7 @@ other repositories using standard GIT functionality.
 
 Note that StGIT is not an SCM interface on top of GIT and it expects a
 previously initialised GIT repository (unless it is cloned using StGIT
-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.
 
 For the latest version see http://www.procode.org/stgit/
 For a tutorial see http://wiki.procode.org/cgi-bin/wiki.cgi/StGIT_Tutorial

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

[Matthieu Moy]

Karl Hasselström <kha@treskal.com> writes:

> -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?

-- 
Matthieu

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

[David Kågedal]

Matthieu Moy <Matthieu.Moy@imag.fr> writes:

> Karl Hasselström <kha@treskal.com> writes:
>
>> -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?

Karl has been working hard lately to make sure that stg doesn't get
confused when you use git directly.

-- 
David Kågedal

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

[Karl Hasselström]

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

> Karl Hasselström <kha@treskal.com> writes:
>
> > -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).

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

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

[Karl Hasselström]

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

> On 2007-11-05 10:57:17 +0100, Matthieu Moy wrote:
>
> > 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

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

[David Kågedal]

Karl Hasselström <kha@treskal.com> writes:

> On 2007-11-05 10:57:17 +0100, Matthieu Moy wrote:
>
>> Karl Hasselström <kha@treskal.com> writes:
>>
>> > -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

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

[Karl Hasselström]

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