From: "David Kågedal" <davidk@lysator.liu.se>
To: "Matthieu Moy" <Matthieu.Moy@imag.fr>,
"Karl Hasselström" <kha@treskal.com>
Cc: git@vger.kernel.org, Catalin Marinas <catalin.marinas@gmail.com>
Subject: Re: [StGit PATCH] Cogito is deprecated, so don't point to it
Date: Mon, 05 Nov 2007 13:21:13 +0100 [thread overview]
Message-ID: <87zlxsannq.fsf@lysator.liu.se> (raw)
In-Reply-To: <20071105120014.GA17406@diana.vm.bytemark.co.uk> ("Karl Hasselström"'s message of "Mon\, 5 Nov 2007 13\:00\:14 +0100")
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
next prev parent reply other threads:[~2007-11-05 12:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-11-05 3:07 [StGit PATCH] Cogito is deprecated, so don't point to it Karl Hasselström
2007-11-05 9:57 ` Matthieu Moy
2007-11-05 11:52 ` David Kågedal
2007-11-05 12:00 ` Karl Hasselström
2007-11-05 12:16 ` Karl Hasselström
2007-11-05 12:21 ` David Kågedal [this message]
2007-11-05 13:11 ` Karl Hasselström
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zlxsannq.fsf@lysator.liu.se \
--to=davidk@lysator.liu.se \
--cc=Matthieu.Moy@imag.fr \
--cc=catalin.marinas@gmail.com \
--cc=git@vger.kernel.org \
--cc=kha@treskal.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.