On Sun, 9 Jul 2006, Petr Baudis yowled: > Hi, > > Dear diary, on Sun, Jul 09, 2006 at 12:48:22AM CEST, I got a letter > where Nix <nix@xxxxxxxxxxxxx> said that... >> loki 593 /usr/packages/linux/linux% cg-diff | diffstat > > Note that cg-diff -s might be useful. Indeed :) >> loki 594 /usr/packages/linux/linux% cg-reset >> loki 595 /usr/packages/linux/linux% cg-diff >> loki 596 /usr/packages/linux/linux% > > ...but when you switch away and switch back, the uncommitted changes > appear again? Yes. > Just in case, don't the tree happen to simply stay the same as in the > branch you switched from? (Try cg-diff -r yourpreviousbranch.) Yes. Also, that branch (which was forked recently from the misbehaving one) claims that all changes are merged from that branch, but this is demonstrably untrue. > And most importantly, does this also happen with just stock 0.17.3 > cg-switch? With stock master cg-switch? (If both is no, you probably > forgot to cherrypick some associated cg-switch bugfix or something.) This is 0.17.3 cg-switch plus the seek speedup 40f8a28806a1c5a7cb1f7d137f1bb271b71f890f. (I doubt that's to blame, but I've been wrong before.) I think the oddity is related to git-cherry-pick somehow, but I'm not sure how: I took the original upstream pack again, rebuilt the branches from scratch and now I can't make the problem happen anymore. If it happens again I'll keep the tree around and collect more data. (I'll have to dig some more disk space up...) -- `She *is*, however, one of the few sf authors with a last name ending in O, which adds some extra appeal to those of us who obsess about things like having a book review of an author for each letter in the alphabet.' -- rra - : send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html