{"thread":{"id":"228","subject":"Re: Linux 2.6.12-rc3","startedAt":"2005-04-21T19:09:56Z","lastAt":"2005-04-23T21:31:43Z","messageCount":5,"participants":["Petr Baudis","Pavel Machek"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"1178","messageId":"20050421190956.GA7443@pasky.ji.cz","threadId":"228","inReplyTo":"20050421190009.GC475@openzaurus.ucw.cz","subject":"Re: Linux 2.6.12-rc3","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-04-21T19:09:56Z","receivedAt":"2005-04-21T19:09:56Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Thu, Apr 21, 2005 at 09:00:09PM CEST, I got a letter\nwhere Pavel Machek <pavel@ucw.cz> told me that...\n> Hi!\n\nHi,\n\n> > > Well, not sure.\n> > > \n> > > I did \n> > > \n> > > git track linus\n> > > git cancel\n> > > \n> > > but Makefile still contains -rc2. (Is \"git cancel\" right way to check\n> > > out the tree?)\n> > \n> > No. git cancel does what it says - cancels your local changes to the\n> > working tree. git track will only set that next time you pull from\n> > linus, the changes will be automatically merged. (Note that this will\n> > change with the big UI change.)\n> \n> Is there way to say \"forget those changes in my repository, I want\n> just plain vanilla\" without rm -rf?\n\ngit cancel will give you \"plain last commit\". If you need plain vanilla,\nthe \"hard way\" now is to just do\n\n\tcommit-id >.git/HEAD\n\nbut your current HEAD will be lost forever. Or do\n\n\tgit fork vanilla ~/vanilla linus\n\nand you will have the vanilla tree tracking linus in ~/vanilla.\n\nI'm not yet sure if we should have some Cogito interface for doing this\nand what its semantics should be.\n\n> I see quite a lot of problems with fsck-tree. Is that normal?\n> (I ran out of disk space few times during different operations...)\n\nActually, in case your tree is older than about two days, I hope you did\nthe convert-cache magic or fetched a fresh tree?\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"},{"id":"1198","messageId":"20050421213811.GA31207@elf.ucw.cz","threadId":"228","inReplyTo":"20050421190956.GA7443@pasky.ji.cz","subject":"Re: Linux 2.6.12-rc3","fromName":"Pavel Machek","fromEmail":"pavel@ucw.cz","sentAt":"2005-04-21T21:38:11Z","receivedAt":"2005-04-21T21:38:11Z","isPatch":false,"sender":{"key":"pavel@ucw.cz","avatar":null},"body":"Hi!\n\nIt seems that someone should write \"Kernel hacker's guide to\ngit\"... Documentation/git.txt seems like good place. I guess I'll do\nit.\n\n> > just plain vanilla\" without rm -rf?\n> \n> git cancel will give you \"plain last commit\". If you need plain vanilla,\n> the \"hard way\" now is to just do\n> \n> \tcommit-id >.git/HEAD\n> \n> but your current HEAD will be lost forever. Or do\n> \n> \tgit fork vanilla ~/vanilla linus\n> \n> and you will have the vanilla tree tracking linus in ~/vanilla.\n\nOk, thanks.\n\n> I'm not yet sure if we should have some Cogito interface for doing this\n> and what its semantics should be.\n\nWhat is Cogito, BTW?\n\n> > I see quite a lot of problems with fsck-tree. Is that normal?\n> > (I ran out of disk space few times during different operations...)\n> \n> Actually, in case your tree is older than about two days, I hope you did\n> the convert-cache magic or fetched a fresh tree?\n\nNo, I did not anything like that. I guess it is rm -rf time, then...\n\n\t\t\t\t\t\t\t\t\tPavel\n-- \nBoycott Kodak -- for their patent abuse against Java.\n"},{"id":"1199","messageId":"20050421214119.GO7443@pasky.ji.cz","threadId":"228","inReplyTo":"20050421213811.GA31207@elf.ucw.cz","subject":"Re: Linux 2.6.12-rc3","fromName":"Petr Baudis","fromEmail":"pasky@ucw.cz","sentAt":"2005-04-21T21:41:19Z","receivedAt":"2005-04-21T21:41:19Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Thu, Apr 21, 2005 at 11:38:11PM CEST, I got a letter\nwhere Pavel Machek <pavel@ucw.cz> told me that...\n> Hi!\n> \n> It seems that someone should write \"Kernel hacker's guide to\n> git\"... Documentation/git.txt seems like good place. I guess I'll do\n> it.\n\nI've also started writing some tutorial-like guide to Cogito on my\nnotebook, but I have time for that only during lectures. :^)\n\n> > I'm not yet sure if we should have some Cogito interface for doing this\n> > and what its semantics should be.\n> \n> What is Cogito, BTW?\n\nNew name for git-pasky. Everyone will surely rejoice as the usage will\nchange significantly. But better let's clean it up now.\n\n(For more details, check git@ archives for git-pasky-0.6 announcement.)\n\n> > > I see quite a lot of problems with fsck-tree. Is that normal?\n> > > (I ran out of disk space few times during different operations...)\n> > \n> > Actually, in case your tree is older than about two days, I hope you did\n> > the convert-cache magic or fetched a fresh tree?\n> \n> No, I did not anything like that. I guess it is rm -rf time, then...\n\nThat's the root of all your problems then.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nC++: an octopus made by nailing extra legs onto a dog. -- Steve Taylor\n"},{"id":"1206","messageId":"20050421223020.GB31207@elf.ucw.cz","threadId":"228","inReplyTo":"20050421214119.GO7443@pasky.ji.cz","subject":"Re: Linux 2.6.12-rc3","fromName":"Pavel Machek","fromEmail":"pavel@ucw.cz","sentAt":"2005-04-21T22:30:20Z","receivedAt":"2005-04-21T22:30:20Z","isPatch":false,"sender":{"key":"pavel@ucw.cz","avatar":null},"body":"Hi!\n\n> > It seems that someone should write \"Kernel hacker's guide to\n> > git\"... Documentation/git.txt seems like good place. I guess I'll do\n> > it.\n> \n> I've also started writing some tutorial-like guide to Cogito on my\n> notebook, but I have time for that only during lectures. :^)\n\nWell, this will be really short and really kernel oriented.\n\n> > > I'm not yet sure if we should have some Cogito interface for doing this\n> > > and what its semantics should be.\n> > \n> > What is Cogito, BTW?\n> \n> New name for git-pasky. Everyone will surely rejoice as the usage will\n> change significantly. But better let's clean it up now.\n> \n> (For more details, check git@ archives for git-pasky-0.6\n> announcement.)\n\nI liked git, and git-pasky did not seem too wrong, either... I did\ngoogle search for cogito, and there are several companies named that\nway, and some are software-related. git was bad name, but cogito seems\nbad, too. I'd stick with git.\n\n\t\t\t\t\t\t\t\tPavel\n-- \nBoycott Kodak -- for their patent abuse against Java.\n"},{"id":"1419","messageId":"20050423213143.GA4978@elf.ucw.cz","threadId":"228","inReplyTo":"20050421190956.GA7443@pasky.ji.cz","subject":"Re: Linux 2.6.12-rc3","fromName":"Pavel Machek","fromEmail":"pavel@ucw.cz","sentAt":"2005-04-23T21:31:43Z","receivedAt":"2005-04-23T21:31:43Z","isPatch":false,"sender":{"key":"pavel@ucw.cz","avatar":null},"body":"Hi!\n\n> > > > Well, not sure.\n> > > > \n> > > > I did \n> > > > \n> > > > git track linus\n> > > > git cancel\n> > > > \n> > > > but Makefile still contains -rc2. (Is \"git cancel\" right way to check\n> > > > out the tree?)\n> > > \n> > > No. git cancel does what it says - cancels your local changes to the\n> > > working tree. git track will only set that next time you pull from\n> > > linus, the changes will be automatically merged. (Note that this will\n> > > change with the big UI change.)\n> > \n> > Is there way to say \"forget those changes in my repository, I want\n> > just plain vanilla\" without rm -rf?\n> \n> git cancel will give you \"plain last commit\". If you need plain vanilla,\n> the \"hard way\" now is to just do\n> \n> \tcommit-id >.git/HEAD\n> \n> but your current HEAD will be lost forever. Or do\n> \n> \tgit fork vanilla ~/vanilla linus\n> \n> and you will have the vanilla tree tracking linus in ~/vanilla.\n\nYep, symlinked in nice way. Good trap; it cought me ;-). (I of course\ndeleted the original directory).\n\n> I'm not yet sure if we should have some Cogito interface for doing this\n> and what its semantics should be.\n\nPerhaps \"git init\" is right command for this? Running it in non-empty\ndirectory for faster restart after bad problem....\n\t\t\t\t\t\t\t\tPavel\n-- \nBoycott Kodak -- for their patent abuse against Java.\n"}]}