{"thread":{"id":"10658","subject":"[StGit PATCH] Cogito is deprecated, so don't point to it","startedAt":"2007-11-05T03:07:57Z","lastAt":"2007-11-05T13:11:50Z","messageCount":7,"participants":["Karl Hasselström","Matthieu Moy","David Kågedal"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"58335","messageId":"20071105030608.6033.35208.stgit@yoghurt","threadId":"10658","inReplyTo":null,"subject":"[StGit PATCH] Cogito is deprecated, so don't point to it","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-11-05T03:07:57Z","receivedAt":"2007-11-05T03:07:57Z","isPatch":true,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"Signed-off-by: Karl Hasselström \n\n---\n\nAlso available from\n\n git://repo.or.cz/stgit/kha.git safe\n\n README | 4 +---\n 1 files changed, 1 insertions(+), 3 deletions(-)\n\n\ndiff --git a/README b/README\nindex 0e648f5..4f20154 100644\n--- a/README\n+++ b/README\n@@ -6,9 +6,7 @@ other repositories using standard GIT functionality.\n \n Note that StGIT is not an SCM interface on top of GIT and it expects a\n previously initialised GIT repository (unless it is cloned using StGIT\n-directly). For standard SCM operations, either use plain GIT commands\n-or the Cogito tool but it is not recommended to mix them with the\n-StGIT commands.\n+directly). For standard SCM operations, use plain GIT commands.\n \n For the latest version see http://www.procode.org/stgit/\n For a tutorial see http://wiki.procode.org/cgi-bin/wiki.cgi/StGIT_Tutorial\n"},{"id":"58356","messageId":"vpqejf510ci.fsf@bauges.imag.fr","threadId":"10658","inReplyTo":"20071105030608.6033.35208.stgit@yoghurt","subject":"Re: [StGit PATCH] Cogito is deprecated, so don't point to it","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@imag.fr","sentAt":"2007-11-05T09:57:17Z","receivedAt":"2007-11-05T09:57:17Z","isPatch":true,"sender":{"key":"git@matthieu-moy.fr","avatar":"https://avatars.githubusercontent.com/u/14709?v=4"},"body":"Karl Hasselström writes:\n\n> -directly). For standard SCM operations, either use plain GIT commands\n> -or the Cogito tool but it is not recommended to mix them with the\n> -StGIT commands.\n> +directly). For standard SCM operations, use plain GIT commands.\n\nDoesn't the \"but it is not recommended to mix them with the StGIT\ncommands.\" part still hold?\n\n-- \nMatthieu\n"},{"id":"58362","messageId":"874pg0c3kv.fsf@lysator.liu.se","threadId":"10658","inReplyTo":"vpqejf510ci.fsf@bauges.imag.fr","subject":"Re: [StGit PATCH] Cogito is deprecated, so don't point to it","fromName":"David Kågedal","fromEmail":"davidk@lysator.liu.se","sentAt":"2007-11-05T11:52:00Z","receivedAt":"2007-11-05T11:52:00Z","isPatch":true,"sender":{"key":"davidk@lysator.liu.se","avatar":"https://avatars.githubusercontent.com/u/60530?v=4"},"body":"Matthieu Moy writes:\n\n> Karl Hasselström writes:\n>\n>> -directly). For standard SCM operations, either use plain GIT commands\n>> -or the Cogito tool but it is not recommended to mix them with the\n>> -StGIT commands.\n>> +directly). For standard SCM operations, use plain GIT commands.\n>\n> Doesn't the \"but it is not recommended to mix them with the StGIT\n> commands.\" part still hold?\n\nKarl has been working hard lately to make sure that stg doesn't get\nconfused when you use git directly.\n\n-- \nDavid Kågedal\n"},{"id":"58363","messageId":"20071105120014.GA17406@diana.vm.bytemark.co.uk","threadId":"10658","inReplyTo":"vpqejf510ci.fsf@bauges.imag.fr","subject":"Re: [StGit PATCH] Cogito is deprecated, so don't point to it","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-11-05T12:00:14Z","receivedAt":"2007-11-05T12:00:14Z","isPatch":true,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2007-11-05 10:57:17 +0100, Matthieu Moy wrote:\n\n> Karl Hasselström writes:\n>\n> > -directly). For standard SCM operations, either use plain GIT commands\n> > -or the Cogito tool but it is not recommended to mix them with the\n> > -StGIT commands.\n> > +directly). For standard SCM operations, use plain GIT commands.\n>\n> Doesn't the \"but it is not recommended to mix them with the StGIT\n> commands.\" part still hold?\n\nI'm not sure it ever held. Except possibly during merge resolution,\nbut that mismatch is going away with the patch series by David Kågedal\nthat's sitting in kha/experimental (which changes StGit to use exactly\nthe same conflict representation as git).\n\n-- \nKarl Hasselström, kha@treskal.com\n www.treskal.com/kalle\n"},{"id":"58367","messageId":"20071105121656.GA17700@diana.vm.bytemark.co.uk","threadId":"10658","inReplyTo":"20071105120014.GA17406@diana.vm.bytemark.co.uk","subject":"Re: [StGit PATCH] Cogito is deprecated, so don't point to it","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-11-05T12:16:56Z","receivedAt":"2007-11-05T12:16:56Z","isPatch":true,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2007-11-05 13:00:14 +0100, Karl Hasselström wrote:\n\n> On 2007-11-05 10:57:17 +0100, Matthieu Moy wrote:\n>\n> > Doesn't the \"but it is not recommended to mix them with the StGIT\n> > commands.\" part still hold?\n>\n> I'm not sure it ever held. Except possibly during merge resolution,\n> but that mismatch is going away with the patch series by David\n> Kågedal that's sitting in kha/experimental (which changes StGit to\n> use exactly the same conflict representation as git).\n\nMmm. Then there's of course the fact that if you use git commands to\nchange the branch ref (e.g. committing, resetting, and so on) you need\nto run assimilate to deconfuse StGit. But it'll tell you so.\n\nSo I guess the (or at least my) conclusion is that we ought to have an\nStGit User Manual where the user can learn these things, preferably\nwith examples and pretty DAG graphs. Half a sentence doesn't buy us\nthat much.\n\n-- \nKarl Hasselström, kha@treskal.com\n www.treskal.com/kalle\n"},{"id":"58368","messageId":"87zlxsannq.fsf@lysator.liu.se","threadId":"10658","inReplyTo":"20071105120014.GA17406@diana.vm.bytemark.co.uk","subject":"Re: [StGit PATCH] Cogito is deprecated, so don't point to it","fromName":"David Kågedal","fromEmail":"davidk@lysator.liu.se","sentAt":"2007-11-05T12:21:13Z","receivedAt":"2007-11-05T12:21:13Z","isPatch":true,"sender":{"key":"davidk@lysator.liu.se","avatar":"https://avatars.githubusercontent.com/u/60530?v=4"},"body":"Karl Hasselström writes:\n\n> On 2007-11-05 10:57:17 +0100, Matthieu Moy wrote:\n>\n>> Karl Hasselström writes:\n>>\n>> > -directly). For standard SCM operations, either use plain GIT commands\n>> > -or the Cogito tool but it is not recommended to mix them with the\n>> > -StGIT commands.\n>> > +directly). For standard SCM operations, use plain GIT commands.\n>>\n>> Doesn't the \"but it is not recommended to mix them with the StGIT\n>> commands.\" part still hold?\n>\n> I'm not sure it ever held. Except possibly during merge resolution,\n> but that mismatch is going away with the patch series by David Kågedal\n> that's sitting in kha/experimental (which changes StGit to use exactly\n> the same conflict representation as git).\n\nDon't forget your new assimilate implementation.\n\n-- \nDavid Kågedal\n"},{"id":"58377","messageId":"20071105131150.GA18556@diana.vm.bytemark.co.uk","threadId":"10658","inReplyTo":"87zlxsannq.fsf@lysator.liu.se","subject":"Re: [StGit PATCH] Cogito is deprecated, so don't point to it","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-11-05T13:11:50Z","receivedAt":"2007-11-05T13:11:50Z","isPatch":true,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2007-11-05 13:21:13 +0100, David Kågedal wrote:\n\n> Don't forget your new assimilate implementation.\n\nThat's in Catalin's master branch already, so there can't possibly be\na release that has this patch and not the assimilate improvements. But\nyes, that's what makes it possible to easily recover from just about\nanything the git commands can do.\n\n-- \nKarl Hasselström, kha@treskal.com\n www.treskal.com/kalle\n"}]}