* Help please :-)
@ 2006-04-15 16:08 Paolo Ciarrocchi
2006-04-15 19:10 ` Petr Baudis
0 siblings, 1 reply; 3+ messages in thread
From: Paolo Ciarrocchi @ 2006-04-15 16:08 UTC (permalink / raw)
To: Git Mailing List
Hi all,
I'm used to keep updated my linux tree with cg-status,
I did that this morning but now I see the following:
paolo@Italia:~/linux-2.6$ cg-status
Heads:
>master 2c5362007bc0a46461a9d94958cdd53bb027004c
R origin 2c5362007bc0a46461a9d94958cdd53bb027004c
? arch/i386/kernel/smpboot.c.rej
? drivers/md/dm-stripe.c.rej
? drivers/net/chelsio/sge.c.rej
? drivers/net/e100.c.rej
? drivers/net/e1000/e1000_main.c.rej
? fs/9p/vfs_dir.c.rej
? fs/nfsctl.c.rej
? kernel/fork.c.rej
? kernel/posix-timers.c.rej
? kernel/timer.c.rej
? mm/memory.c.rej
? mm/mempolicy.c.rej
? mm/swap.c.rej
? net/ieee80211/ieee80211_crypt_ccmp.c.rej
? net/ieee80211/ieee80211_rx.c.rej
? scripts/kconfig/lkc_defs.h
? scripts/mod/modpost.c.rej
paolo@Italia:~/linux-2.6$ cg-diff
I'm a bit lost, the tree is correctly updated, no error message but
why I see all these .rej?
And how can I fix this problem?
git reset and cg-reset don't help...
Thanks!
--
Paolo
http://paolociarrocchi.googlepages.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Help please :-)
2006-04-15 16:08 Help please :-) Paolo Ciarrocchi
@ 2006-04-15 19:10 ` Petr Baudis
2006-04-16 9:30 ` Paolo Ciarrocchi
0 siblings, 1 reply; 3+ messages in thread
From: Petr Baudis @ 2006-04-15 19:10 UTC (permalink / raw)
To: Paolo Ciarrocchi; +Cc: Git Mailing List
Hello,
Dear diary, on Sat, Apr 15, 2006 at 06:08:01PM CEST, I got a letter
where Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> said that...
> I'm used to keep updated my linux tree with cg-status,
> I did that this morning but now I see the following:
> paolo@Italia:~/linux-2.6$ cg-status
> Heads:
> >master 2c5362007bc0a46461a9d94958cdd53bb027004c
> R origin 2c5362007bc0a46461a9d94958cdd53bb027004c
>
> ? arch/i386/kernel/smpboot.c.rej
> ? drivers/md/dm-stripe.c.rej
> ? drivers/net/chelsio/sge.c.rej
> ? drivers/net/e100.c.rej
> ? drivers/net/e1000/e1000_main.c.rej
> ? fs/9p/vfs_dir.c.rej
> ? fs/nfsctl.c.rej
> ? kernel/fork.c.rej
> ? kernel/posix-timers.c.rej
> ? kernel/timer.c.rej
> ? mm/memory.c.rej
> ? mm/mempolicy.c.rej
> ? mm/swap.c.rej
> ? net/ieee80211/ieee80211_crypt_ccmp.c.rej
> ? net/ieee80211/ieee80211_rx.c.rej
> ? scripts/kconfig/lkc_defs.h
> ? scripts/mod/modpost.c.rej
> paolo@Italia:~/linux-2.6$ cg-diff
>
> I'm a bit lost, the tree is correctly updated, no error message but
> why I see all these .rej?
you apparently had local changes in your working tree, did cg-update
and then the local changes conflicted with the new changes in Linus'
tree. cg-update should have told you further details.
> And how can I fix this problem?
> git reset and cg-reset don't help...
cg-clean can remove files not recognized by git.
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
Right now I am having amnesia and deja-vu at the same time. I think
I have forgotten this before.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Help please :-)
2006-04-15 19:10 ` Petr Baudis
@ 2006-04-16 9:30 ` Paolo Ciarrocchi
0 siblings, 0 replies; 3+ messages in thread
From: Paolo Ciarrocchi @ 2006-04-16 9:30 UTC (permalink / raw)
To: Petr Baudis; +Cc: Git Mailing List
On 4/15/06, Petr Baudis <pasky@suse.cz> wrote:
> Hello,
>
> Dear diary, on Sat, Apr 15, 2006 at 06:08:01PM CEST, I got a letter
> where Paolo Ciarrocchi <paolo.ciarrocchi@gmail.com> said that...
> > I'm used to keep updated my linux tree with cg-status,
> > I did that this morning but now I see the following:
> > paolo@Italia:~/linux-2.6$ cg-status
> > Heads:
> > >master 2c5362007bc0a46461a9d94958cdd53bb027004c
> > R origin 2c5362007bc0a46461a9d94958cdd53bb027004c
> >
> > ? arch/i386/kernel/smpboot.c.rej
> > ? drivers/md/dm-stripe.c.rej
> > ? drivers/net/chelsio/sge.c.rej
> > ? drivers/net/e100.c.rej
> > ? drivers/net/e1000/e1000_main.c.rej
> > ? fs/9p/vfs_dir.c.rej
> > ? fs/nfsctl.c.rej
> > ? kernel/fork.c.rej
> > ? kernel/posix-timers.c.rej
> > ? kernel/timer.c.rej
> > ? mm/memory.c.rej
> > ? mm/mempolicy.c.rej
> > ? mm/swap.c.rej
> > ? net/ieee80211/ieee80211_crypt_ccmp.c.rej
> > ? net/ieee80211/ieee80211_rx.c.rej
> > ? scripts/kconfig/lkc_defs.h
> > ? scripts/mod/modpost.c.rej
> > paolo@Italia:~/linux-2.6$ cg-diff
> >
> > I'm a bit lost, the tree is correctly updated, no error message but
> > why I see all these .rej?
>
> you apparently had local changes in your working tree, did cg-update
> and then the local changes conflicted with the new changes in Linus'
> tree. cg-update should have told you further details.
Can this be due an interrupted cg-update?
However, cg-update did not complain.
> > And how can I fix this problem?
> > git reset and cg-reset don't help...
>
> cg-clean can remove files not recognized by git.
Thanks!
Ciao,
--
Paolo
http://paolociarrocchi.googlepages.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2006-04-16 9:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-04-15 16:08 Help please :-) Paolo Ciarrocchi
2006-04-15 19:10 ` Petr Baudis
2006-04-16 9:30 ` Paolo Ciarrocchi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).