{"thread":{"id":"1944","subject":"cogito push problem","startedAt":"2005-09-25T19:22:14Z","lastAt":"2005-09-26T20:51:05Z","messageCount":5,"participants":["Nico -telmich- Schottelius","Petr Baudis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"9272","messageId":"20050925192214.GC19023@schottelius.org","threadId":"1944","inReplyTo":null,"subject":"cogito push problem","fromName":"Nico -telmich- Schottelius","fromEmail":"nico-linux-git@schottelius.org","sentAt":"2005-09-25T19:22:14Z","receivedAt":"2005-09-25T19:22:14Z","isPatch":false,"sender":{"key":"nico-linux-git@schottelius.org","avatar":null},"body":"Hello!\n\nI was trying to push my current work out and recieved this error:\n\n[21:20] hydrogenium:cinit% cg-push main\nerror: remote ref 'refs/heads/master' is not a strict subset of local ref 'refs/heads/master'.\n\nMy questions:\n- What does that mean to me as an end-user?\n- What's the reason that this happened?\n- How do I fix that?\n\nNico\n\n-- \nLatest project: cconfig (http://nico.schotteli.us/papers/linux/cconfig/)\nOpen Source nutures open minds and free, creative developers.\n"},{"id":"9280","messageId":"20050925210908.GA21019@pasky.or.cz","threadId":"1944","inReplyTo":"20050925192214.GC19023@schottelius.org","subject":"Re: cogito push problem","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-09-25T21:09:08Z","receivedAt":"2005-09-25T21:09:08Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sun, Sep 25, 2005 at 09:22:14PM CEST, I got a letter\nwhere Nico -telmich- Schottelius <nico-linux-git@schottelius.org> told me that...\n> Hello!\n> \n> I was trying to push my current work out and recieved this error:\n> \n> [21:20] hydrogenium:cinit% cg-push main\n> error: remote ref 'refs/heads/master' is not a strict subset of local ref 'refs/heads/master'.\n> \n> My questions:\n> - What does that mean to me as an end-user?\n> - What's the reason that this happened?\n> - How do I fix that?\n\nThis means someone probably pushed out some new stuff you don't have\nyet (or you did something evil, like uncommitted something you already\npushed out before). So what to do is cg-update, that will merge the new\nstuff, then try to cg-push again.\n\ncg-push already spits out a somewhat more helpful message about this in\nsome cases, I'll make it do so in all cases. Thanks.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nVI has two modes: the one in which it beeps and the one in which\nit doesn't.\n"},{"id":"9281","messageId":"20050925215259.GE19023@schottelius.org","threadId":"1944","inReplyTo":"20050925210908.GA21019@pasky.or.cz","subject":"Re: cogito push problem","fromName":"Nico -telmich- Schottelius","fromEmail":"nico-linux-git@schottelius.org","sentAt":"2005-09-25T21:52:59Z","receivedAt":"2005-09-25T21:52:59Z","isPatch":false,"sender":{"key":"nico-linux-git@schottelius.org","avatar":null},"body":"Petr Baudis [Sun, Sep 25, 2005 at 11:09:08PM +0200]:\n> Dear diary, on Sun, Sep 25, 2005 at 09:22:14PM CEST, I got a letter\n> where Nico -telmich- Schottelius <nico-linux-git@schottelius.org> told me that...\n> > Hello!\n> > \n> > I was trying to push my current work out and recieved this error:\n> > \n> > [21:20] hydrogenium:cinit% cg-push main\n> > error: remote ref 'refs/heads/master' is not a strict subset of local ref 'refs/heads/master'.\n> > \n> > My questions:\n> > - What does that mean to me as an end-user?\n> > - What's the reason that this happened?\n> > - How do I fix that?\n> \n> This means someone probably pushed out some new stuff you don't have\n> yet (or you did something evil, like uncommitted something you already\n> pushed out before). So what to do is cg-update, that will merge the new\n> stuff, then try to cg-push again.\n\nThanks for your help, cg-update && cg-commit worked fine, because\ncg-update overwrote the changes made by me (I checked cg-diff before,\nso that was my intention, not cg-update's fault).\n\nNico\n\n-- \nLatest project: cconfig (http://nico.schotteli.us/papers/linux/cconfig/)\nOpen Source nutures open minds and free, creative developers.\n"},{"id":"9283","messageId":"20050925220222.GA21013@pasky.or.cz","threadId":"1944","inReplyTo":"20050925215259.GE19023@schottelius.org","subject":"Re: cogito push problem","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2005-09-25T22:02:23Z","receivedAt":"2005-09-25T22:02:23Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"Dear diary, on Sun, Sep 25, 2005 at 11:52:59PM CEST, I got a letter\nwhere Nico -telmich- Schottelius <nico-linux-git@schottelius.org> told me that...\n> Petr Baudis [Sun, Sep 25, 2005 at 11:09:08PM +0200]:\n> > Dear diary, on Sun, Sep 25, 2005 at 09:22:14PM CEST, I got a letter\n> > where Nico -telmich- Schottelius <nico-linux-git@schottelius.org> told me that...\n> > > Hello!\n> > > \n> > > I was trying to push my current work out and recieved this error:\n> > > \n> > > [21:20] hydrogenium:cinit% cg-push main\n> > > error: remote ref 'refs/heads/master' is not a strict subset of local ref 'refs/heads/master'.\n> > > \n> > > My questions:\n> > > - What does that mean to me as an end-user?\n> > > - What's the reason that this happened?\n> > > - How do I fix that?\n> > \n> > This means someone probably pushed out some new stuff you don't have\n> > yet (or you did something evil, like uncommitted something you already\n> > pushed out before). So what to do is cg-update, that will merge the new\n> > stuff, then try to cg-push again.\n> \n> Thanks for your help, cg-update && cg-commit worked fine, because\n> cg-update overwrote the changes made by me (I checked cg-diff before,\n> so that was my intention, not cg-update's fault).\n\nBut it definitively shouldn't do that anyway. Was that 0.15.1?\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nVI has two modes: the one in which it beeps and the one in which\nit doesn't.\n"},{"id":"9326","messageId":"20050926205105.GG19023@schottelius.org","threadId":"1944","inReplyTo":"20050925220222.GA21013@pasky.or.cz","subject":"Re: cogito push problem","fromName":"Nico -telmich- Schottelius","fromEmail":"nico-linux-git@schottelius.org","sentAt":"2005-09-26T20:51:05Z","receivedAt":"2005-09-26T20:51:05Z","isPatch":false,"sender":{"key":"nico-linux-git@schottelius.org","avatar":null},"body":"Petr Baudis [Mon, Sep 26, 2005 at 12:02:23AM +0200]:\n> > Thanks for your help, cg-update && cg-commit worked fine, because\n> > cg-update overwrote the changes made by me (I checked cg-diff before,\n> > so that was my intention, not cg-update's fault).\n> \n> But it definitively shouldn't do that anyway. Was that 0.15.1?\n\nNo:\n\n[18:51] hydrogenium:cinit% cg --version\ncogito-0.14.2 (e9f8fea9ab0a71dfc6586d18a362bcae6843f074)\nYou have new mail.\n\nI was too lazy to update, but will do that now.\n\nNico\n\n-- \nLatest project: cconfig (http://nico.schotteli.us/papers/linux/cconfig/)\nOpen Source nutures open minds and free, creative developers.\n"}]}