From: Dave Kleikamp Date: Fri, 06 May 2005 17:58:51 GMT Subject: Re: How do I... Message-ID: <1115402331.10460.16.camel@localhost> In-Reply-To: <427B9DC5.9060905@tuxrocks.com> On Fri, 2005-05-06 at 10:39 -0600, Frank Sorenson wrote: > -----BEGIN PGP SIGNED MESSAGE----- > Hash: SHA1 > > Dave Kleikamp wrote: > > On Fri, 2005-05-06 at 03:49 -0600, Frank Sorenson wrote: > > > > > >>After doing a cg-update, can I cg-log just the changes since the last > >>update? Alternatively, how can I tell cg-log I'm caught up, and don't > >>need anything historical? > > > > > > (Assuming pulling from "origin") > > Instead of doing cg-update, do cg-pull. Then "cg-log :origin" will give > > you you the changesets you just pulled. I'm not sure if I was clear. cg-pull should be 'cg-pull origin". > Super. This works great. Thanks. > > > "cg-merge origin" will then > > complete operation, thereby catching you up. > > Okay, not quite so great. Here's the ouput when I ran it to update my > kernel this morning. Note that I haven't made any local modifications. > I'm seeing this sort of thing often enough that I'm blowing away my > whole git tree and regenerating it to get back to a stable state once or > twice a week. I'm sure there's another way, but without me making > modifications on my end, I wouldn't expect this to happen. Suggestions > are welcome! :) I take this to mean you're seeing problems with cg-update too. cg-update simply runs cg-pull & cg-merge together, so running them separately shouldn't make any difference. > # cg-merge origin > Fast-forwarding 6741f3a7f9922391cd02b3ca1329e669497dc22f -> > 2512809255d018744fe6c2f5e996c83769846c07 > on top of 6741f3a7f9922391cd02b3ca1329e669497dc22f... > patching file fs/proc/Makefile > patching file fs/proc/array.c > patching file fs/proc/base.c > patching file fs/proc/generic.c > patching file fs/proc/inode-alloc.txt > patching file fs/proc/inode.c > patching file fs/proc/internal.h > patching file fs/proc/kcore.c > patching file fs/proc/kmsg.c > patching file fs/proc/mmu.c > patching file fs/proc/nommu.c > patching file fs/proc/proc_devtree.c > patching file fs/proc/proc_misc.c > patching file fs/proc/proc_tty.c > patching file fs/proc/root.c > patching file fs/proc/task_mmu.c > patching file fs/proc/task_nommu.c > touch: cannot touch `fs/proc/Makefile': No such file or directory > touch: cannot touch `fs/proc/array.c': No such file or directory > touch: cannot touch `fs/proc/base.c': No such file or directory > touch: cannot touch `fs/proc/generic.c': No such file or directory > touch: cannot touch `fs/proc/inode-alloc.txt': No such file or directory > touch: cannot touch `fs/proc/inode.c': No such file or directory > touch: cannot touch `fs/proc/internal.h': No such file or directory > touch: cannot touch `fs/proc/kcore.c': No such file or directory > touch: cannot touch `fs/proc/kmsg.c': No such file or directory > touch: cannot touch `fs/proc/mmu.c': No such file or directory > touch: cannot touch `fs/proc/nommu.c': No such file or directory > touch: cannot touch `fs/proc/proc_devtree.c': No such file or directory > touch: cannot touch `fs/proc/proc_misc.c': No such file or directory > touch: cannot touch `fs/proc/proc_tty.c': No such file or directory > touch: cannot touch `fs/proc/root.c': No such file or directory > touch: cannot touch `fs/proc/task_mmu.c': No such file or directory > touch: cannot touch `fs/proc/task_nommu.c': No such file or directory > rm: cannot remove `fs/proc/Makefile': No such file or directory > rm: cannot remove `fs/proc/array.c': No such file or directory > rm: cannot remove `fs/proc/base.c': No such file or directory > rm: cannot remove `fs/proc/generic.c': No such file or directory > rm: cannot remove `fs/proc/inode-alloc.txt': No such file or directory > rm: cannot remove `fs/proc/inode.c': No such file or directory > rm: cannot remove `fs/proc/internal.h': No such file or directory > rm: cannot remove `fs/proc/kcore.c': No such file or directory > rm: cannot remove `fs/proc/kmsg.c': No such file or directory > rm: cannot remove `fs/proc/mmu.c': No such file or directory > rm: cannot remove `fs/proc/nommu.c': No such file or directory > rm: cannot remove `fs/proc/proc_devtree.c': No such file or directory > rm: cannot remove `fs/proc/proc_misc.c': No such file or directory > rm: cannot remove `fs/proc/proc_tty.c': No such file or directory > rm: cannot remove `fs/proc/root.c': No such file or directory > rm: cannot remove `fs/proc/task_mmu.c': No such file or directory > rm: cannot remove `fs/proc/task_nommu.c': No such file or directory > fs/proc/Makefile: needs update > fs/proc/array.c: needs update > fs/proc/base.c: needs update > fs/proc/generic.c: needs update > fs/proc/inode-alloc.txt: needs update > fs/proc/inode.c: needs update > fs/proc/internal.h: needs update > fs/proc/kcore.c: needs update > fs/proc/kmsg.c: needs update > fs/proc/mmu.c: needs update > fs/proc/nommu.c: needs update > fs/proc/proc_devtree.c: needs update > fs/proc/proc_misc.c: needs update > fs/proc/proc_tty.c: needs update > fs/proc/root.c: needs update > fs/proc/task_mmu.c: needs update > fs/proc/task_nommu.c: needs update I've seen some isolated problems running cg-update/cg-merge to a clean tree with files that have been deleted. Saw this this morning: shaggy@kleikamp linus-clean $ cg-merge origin Fast-forwarding bfd4bda097f8758d28e632ff2035e25577f6b060 -> 2512809255d018744fe6c2f5e996c83769846c07 on top of bfd4bda097f8758d28e632ff2035e25577f6b060... patching file drivers/video/intelfb/intelfb.h shaggy@kleikamp linus-clean $ cg-status ? drivers/video/intelfb/intelfbdrv.h Removing the file manually appears to fix it. > Thanks, > Frank > - -- > Frank Sorenson - KD7TZK > Systems Manager, Computer Science Department > Brigham Young University > frank@tuxrocks.com -- David Kleikamp IBM Linux Technology Center