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

From: David Kågedal <davidk@lysator.liu.se>
Date: Nov 5, 2007, 12:21 UTC
Message-ID: <87zlxsannq.fsf@lysator.liu.se>
In-Reply-To: <20071105120014.GA17406@diana.vm.bytemark.co.uk>

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

Show 16 quoted lines

> 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