{"thread":{"id":"1241","subject":"cg update failing","startedAt":"2005-07-14T18:04:35Z","lastAt":"2005-07-20T08:12:26Z","messageCount":9,"participants":["James Cloos","Darrin Thompson","Petr Baudis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"6140","messageId":"m3oe95qn64.fsf@lugabout.cloos.reno.nv.us","threadId":"1241","inReplyTo":null,"subject":"cg update failing","fromName":"James Cloos","fromEmail":"cloos+vger-git@jhcloos.com","sentAt":"2005-07-14T18:04:35Z","receivedAt":"2005-07-14T18:04:35Z","isPatch":false,"sender":{"key":"cloos+vger-git@jhcloos.com","avatar":null},"body":"I'm getting this on my clone of linus' tree:\n\n,----\n| cg-merge: merge blocked: seeked from master\n`----\n\nI've not found a way past it.\n\nIs there an easy way, or do I have still yet another borked lk clone?\n\n(Borked clones would be much less of an issue if I had more bandwidth\nthan disk space, but at the moment I'm stuck behind a straw. Cloning\nsomething like lk takes hours.)\n\n-JimC\n-- \nJames H. Cloos, Jr. \n"},{"id":"6142","messageId":"1121365461.4729.0.camel@localhost.localdomain","threadId":"1241","inReplyTo":"m3oe95qn64.fsf@lugabout.cloos.reno.nv.us","subject":"Re: cg update failing","fromName":"Darrin Thompson","fromEmail":"darrint@progeny.com","sentAt":"2005-07-14T18:24:21Z","receivedAt":"2005-07-14T18:24:21Z","isPatch":false,"sender":{"key":"darrint@progeny.com","avatar":null},"body":"On Thu, 2005-07-14 at 14:04 -0400, James Cloos wrote:\n> I'm getting this on my clone of linus' tree:\n> \n> ,----\n> | cg-merge: merge blocked: seeked from master\n> `----\n> \n> I've not found a way past it.\n\ncg-seek master ?\n\n--\nDarrin\n"},{"id":"6144","messageId":"m3k6jtnod8.fsf@lugabout.cloos.reno.nv.us","threadId":"1241","inReplyTo":"1121365461.4729.0.camel@localhost.localdomain","subject":"Re: cg update failing","fromName":"James Cloos","fromEmail":"cloos+vger-git@jhcloos.com","sentAt":"2005-07-14T20:06:59Z","receivedAt":"2005-07-14T20:06:59Z","isPatch":false,"sender":{"key":"cloos+vger-git@jhcloos.com","avatar":null},"body":">>>>> \"Darrin\" == Darrin Thompson writes:\n\nJimC> cg-merge: merge blocked: seeked from master `----\n\nDarrin> cg-seek master ?\n\n:; cg seek master\nOn commit 514fd7fd01d378a7b5584c657d9807fc28f22079\n\n-JimC\n"},{"id":"6145","messageId":"1121376069.4729.2.camel@localhost.localdomain","threadId":"1241","inReplyTo":"m3k6jtnod8.fsf@lugabout.cloos.reno.nv.us","subject":"Re: cg update failing","fromName":"Darrin Thompson","fromEmail":"darrint@progeny.com","sentAt":"2005-07-14T21:21:09Z","receivedAt":"2005-07-14T21:21:09Z","isPatch":false,"sender":{"key":"darrint@progeny.com","avatar":null},"body":"On Thu, 2005-07-14 at 16:06 -0400, James Cloos wrote:\n> >>>>> \"Darrin\" == Darrin Thompson writes:\n> \n> JimC> cg-merge: merge blocked: seeked from master `----\n> \n> Darrin> cg-seek master ?\n> \n> :; cg seek master\n> On commit 514fd7fd01d378a7b5584c657d9807fc28f22079\n\nNow your merge should not be blocked. No?\n\n--\nDarrin\n"},{"id":"6147","messageId":"m3d5plm50o.fsf@lugabout.cloos.reno.nv.us","threadId":"1241","inReplyTo":"1121376069.4729.2.camel@localhost.localdomain","subject":"Re: cg update failing","fromName":"James Cloos","fromEmail":"cloos+vger-git@jhcloos.com","sentAt":"2005-07-14T21:50:15Z","receivedAt":"2005-07-14T21:50:15Z","isPatch":false,"sender":{"key":"cloos+vger-git@jhcloos.com","avatar":null},"body":">>>>> \"Darrin\" == Darrin Thompson writes:\n\nDarrin> Now your merge should not be blocked. No?\n\nI figured out what you meant after I sent that first reply, but waited\nfor update to finish to be sure it worked before replying again.\n\nIt took about thirty minutes, and claimed that I had local changes (it\nwas a pristine clone) that it needed to bring forward, but it seems OK.\n\nNow I just need to remember how to get the checked-out copy\nupdated from the 2.6.12 tag to current. ;)\n\n(I'd been using hg, but www.kernel.org/hg is fubar, so I had to go\nback to my cg clone.)\n\n-JimC\n"},{"id":"6170","messageId":"m3eka04shr.fsf@lugabout.cloos.reno.nv.us","threadId":"1241","inReplyTo":"m3d5plm50o.fsf@lugabout.cloos.reno.nv.us","subject":"Re: cg update failing","fromName":"James Cloos","fromEmail":"cloos+vger-git@jhcloos.com","sentAt":"2005-07-15T04:12:48Z","receivedAt":"2005-07-15T04:12:48Z","isPatch":false,"sender":{"key":"cloos+vger-git@jhcloos.com","avatar":null},"body":"Well, it wasn't as Ok as I first thought. There were several .rej and\nbackup files as left behind by patch(1). cg update HEAD says: Branch\nalready fully merged but Makefile still says 2.6.12.\n\nI'm cloning now to a remote uml and will try and rsync from there to\nthe laptop. Perhaps *that* will get me a working repo.\n\n[SIGH]\n\n-JimC\n"},{"id":"6263","messageId":"20050720010712.GB2255@pasky.ji.cz","threadId":"1241","inReplyTo":"m3eka04shr.fsf@lugabout.cloos.reno.nv.us","subject":"Re: cg update failing","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-07-20T01:07:12Z","receivedAt":"2005-07-20T01:07:12Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Fri, Jul 15, 2005 at 06:12:48AM CEST, I got a letter\nwhere James Cloos told me that...\n> Well, it wasn't as Ok as I first thought. There were several .rej and\n> backup files as left behind by patch(1). cg update HEAD says: Branch\n> already fully merged but Makefile still says 2.6.12.\n> \n> I'm cloning now to a remote uml and will try and rsync from there to\n> the laptop. Perhaps *that* will get me a working repo.\n\nHuh. Well, you had to do uberweird things with your repository - why did\nyou cg-seek at all? What Cogito version is it?\n\nAnyway, cg-reset (or cg-cancel in \"older\" Cogito) should bring\neverything in shape.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nIf you want the holes in your knowledge showing up try teaching\nsomeone. -- Alan Cox\n"},{"id":"6274","messageId":"m3oe8yw0ws.fsf@lugabout.cloos.reno.nv.us","threadId":"1241","inReplyTo":"20050720010712.GB2255@pasky.ji.cz","subject":"Re: cg update failing","fromName":"James Cloos","fromEmail":"cloos+vger-git@jhcloos.com","sentAt":"2005-07-20T04:34:43Z","receivedAt":"2005-07-20T04:34:43Z","isPatch":false,"sender":{"key":"cloos+vger-git@jhcloos.com","avatar":null},"body":">>>>> \"Petr\" == Petr Baudis writes:\n\nPetr> Huh. Well, you had to do uberweird things with your repository -\nPetr> why did you cg-seek at all? What Cogito version is it?\n\nAll I ever did was track and compile linus’ tree. IIRC, when the\nfirst new tag was added after I cloned the tree I had to seek to\nthat tag to see the new versions of the files. But obviously\nthat was long enough before hg’s repo broke that I’d forgotten\nhow I’d done that....\n\nI forget what version I started with. I’ve been tracking gentoo’s\nebuild since it entered portage.\n\n-JimC\n-- \nJames H. Cloos, Jr. \n"},{"id":"6275","messageId":"20050720081226.GA27102@pasky.ji.cz","threadId":"1241","inReplyTo":"m3oe8yw0ws.fsf@lugabout.cloos.reno.nv.us","subject":"Re: cg update failing","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-07-20T08:12:26Z","receivedAt":"2005-07-20T08:12:26Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Wed, Jul 20, 2005 at 06:34:43AM CEST, I got a letter\nwhere James Cloos told me that...\n> >>>>> \"Petr\" == Petr Baudis writes:\n> \n> Petr> Huh. Well, you had to do uberweird things with your repository -\n> Petr> why did you cg-seek at all? What Cogito version is it?\n> \n> All I ever did was track and compile linus??? tree. IIRC, when the\n> first new tag was added after I cloned the tree I had to seek to\n> that tag to see the new versions of the files. But obviously\n> that was long enough before hg???s repo broke that I???d forgotten\n> how I???d done that....\n\nAh so. Well, yes, the first tag was IIRC weird since it was a tree tag,\nnot a commit tag. That confused things, but it shouldn't be necessary\nanymore since all new tags are hopefully commits. That might somehow\ncreate the local modifications as well, although I don't have a clear\nidea how could be that possible. Well, there were some bugs like this in\nCogito in the past, but that should be long fixed.\n\nThanks anyway,\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nIf you want the holes in your knowledge showing up try teaching\nsomeone. -- Alan Cox\n"}]}