{"thread":{"id":"3880","subject":"Help please :-)","startedAt":"2006-04-15T16:08:01Z","lastAt":"2006-04-16T09:30:07Z","messageCount":3,"participants":["Paolo Ciarrocchi","Petr Baudis"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"18701","messageId":"4d8e3fd30604150908m565e8aaat8ef9846a85c4036e@mail.gmail.com","threadId":"3880","inReplyTo":null,"subject":"Help please :-)","fromName":"Paolo Ciarrocchi","fromEmail":"paolo.ciarrocchi@gmail.com","sentAt":"2006-04-15T16:08:01Z","receivedAt":"2006-04-15T16:08:01Z","isPatch":false,"sender":{"key":"paolo.ciarrocchi@gmail.com","avatar":null},"body":"Hi all,\nI'm used to keep updated my linux tree with cg-status,\nI did that this morning but now I see the following:\npaolo@Italia:~/linux-2.6$ cg-status\nHeads:\n   >master      2c5362007bc0a46461a9d94958cdd53bb027004c\n  R origin      2c5362007bc0a46461a9d94958cdd53bb027004c\n\n? arch/i386/kernel/smpboot.c.rej\n? drivers/md/dm-stripe.c.rej\n? drivers/net/chelsio/sge.c.rej\n? drivers/net/e100.c.rej\n? drivers/net/e1000/e1000_main.c.rej\n? fs/9p/vfs_dir.c.rej\n? fs/nfsctl.c.rej\n? kernel/fork.c.rej\n? kernel/posix-timers.c.rej\n? kernel/timer.c.rej\n? mm/memory.c.rej\n? mm/mempolicy.c.rej\n? mm/swap.c.rej\n? net/ieee80211/ieee80211_crypt_ccmp.c.rej\n? net/ieee80211/ieee80211_rx.c.rej\n? scripts/kconfig/lkc_defs.h\n? scripts/mod/modpost.c.rej\npaolo@Italia:~/linux-2.6$ cg-diff\n\nI'm a bit lost, the tree is correctly updated, no error message but\nwhy I see all these .rej?\nAnd how can I fix this problem?\ngit reset and cg-reset don't help...\n\nThanks!\n\n\n--\nPaolo\nhttp://paolociarrocchi.googlepages.com\n"},{"id":"18709","messageId":"20060415191039.GC27689@pasky.or.cz","threadId":"3880","inReplyTo":"4d8e3fd30604150908m565e8aaat8ef9846a85c4036e@mail.gmail.com","subject":"Re: Help please :-)","fromName":"Petr Baudis","fromEmail":"pasky@suse.cz","sentAt":"2006-04-15T19:10:39Z","receivedAt":"2006-04-15T19:10:39Z","isPatch":false,"sender":{"key":"pasky@ucw.cz","avatar":"https://avatars.githubusercontent.com/u/18439?v=4"},"body":"  Hello,\n\nDear diary, on Sat, Apr 15, 2006 at 06:08:01PM CEST, I got a letter\nwhere Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> said that...\n> I'm used to keep updated my linux tree with cg-status,\n> I did that this morning but now I see the following:\n> paolo@Italia:~/linux-2.6$ cg-status\n> Heads:\n>    >master      2c5362007bc0a46461a9d94958cdd53bb027004c\n>   R origin      2c5362007bc0a46461a9d94958cdd53bb027004c\n> \n> ? arch/i386/kernel/smpboot.c.rej\n> ? drivers/md/dm-stripe.c.rej\n> ? drivers/net/chelsio/sge.c.rej\n> ? drivers/net/e100.c.rej\n> ? drivers/net/e1000/e1000_main.c.rej\n> ? fs/9p/vfs_dir.c.rej\n> ? fs/nfsctl.c.rej\n> ? kernel/fork.c.rej\n> ? kernel/posix-timers.c.rej\n> ? kernel/timer.c.rej\n> ? mm/memory.c.rej\n> ? mm/mempolicy.c.rej\n> ? mm/swap.c.rej\n> ? net/ieee80211/ieee80211_crypt_ccmp.c.rej\n> ? net/ieee80211/ieee80211_rx.c.rej\n> ? scripts/kconfig/lkc_defs.h\n> ? scripts/mod/modpost.c.rej\n> paolo@Italia:~/linux-2.6$ cg-diff\n> \n> I'm a bit lost, the tree is correctly updated, no error message but\n> why I see all these .rej?\n\n  you apparently had local changes in your working tree, did cg-update\nand then the local changes conflicted with the new changes in Linus'\ntree. cg-update should have told you further details.\n\n> And how can I fix this problem?\n> git reset and cg-reset don't help...\n\n  cg-clean can remove files not recognized by git.\n\n-- \n\t\t\t\tPetr \"Pasky\" Baudis\nStuff: http://pasky.or.cz/\nRight now I am having amnesia and deja-vu at the same time.  I think\nI have forgotten this before.\n"},{"id":"18726","messageId":"4d8e3fd30604160230g45a67efh9027a7e292e42f3c@mail.gmail.com","threadId":"3880","inReplyTo":"20060415191039.GC27689@pasky.or.cz","subject":"Re: Help please :-)","fromName":"Paolo Ciarrocchi","fromEmail":"paolo.ciarrocchi@gmail.com","sentAt":"2006-04-16T09:30:07Z","receivedAt":"2006-04-16T09:30:07Z","isPatch":false,"sender":{"key":"paolo.ciarrocchi@gmail.com","avatar":null},"body":"On 4/15/06, Petr Baudis <pasky@suse.cz> wrote:\n>   Hello,\n>\n> Dear diary, on Sat, Apr 15, 2006 at 06:08:01PM CEST, I got a letter\n> where Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> said that...\n> > I'm used to keep updated my linux tree with cg-status,\n> > I did that this morning but now I see the following:\n> > paolo@Italia:~/linux-2.6$ cg-status\n> > Heads:\n> >    >master      2c5362007bc0a46461a9d94958cdd53bb027004c\n> >   R origin      2c5362007bc0a46461a9d94958cdd53bb027004c\n> >\n> > ? arch/i386/kernel/smpboot.c.rej\n> > ? drivers/md/dm-stripe.c.rej\n> > ? drivers/net/chelsio/sge.c.rej\n> > ? drivers/net/e100.c.rej\n> > ? drivers/net/e1000/e1000_main.c.rej\n> > ? fs/9p/vfs_dir.c.rej\n> > ? fs/nfsctl.c.rej\n> > ? kernel/fork.c.rej\n> > ? kernel/posix-timers.c.rej\n> > ? kernel/timer.c.rej\n> > ? mm/memory.c.rej\n> > ? mm/mempolicy.c.rej\n> > ? mm/swap.c.rej\n> > ? net/ieee80211/ieee80211_crypt_ccmp.c.rej\n> > ? net/ieee80211/ieee80211_rx.c.rej\n> > ? scripts/kconfig/lkc_defs.h\n> > ? scripts/mod/modpost.c.rej\n> > paolo@Italia:~/linux-2.6$ cg-diff\n> >\n> > I'm a bit lost, the tree is correctly updated, no error message but\n> > why I see all these .rej?\n>\n>   you apparently had local changes in your working tree, did cg-update\n> and then the local changes conflicted with the new changes in Linus'\n> tree. cg-update should have told you further details.\n\nCan this be due an interrupted cg-update?\nHowever, cg-update did not complain.\n\n> > And how can I fix this problem?\n> > git reset and cg-reset don't help...\n>\n>   cg-clean can remove files not recognized by git.\n\nThanks!\n\nCiao,\n--\nPaolo\nhttp://paolociarrocchi.googlepages.com\n"}]}