On Thu, Jan 6, 2011 at 11:22 AM, Carl Eastlund <c...@ccs.neu.edu> wrote: > It looks like you had 53 commits that were pushed to plt/master in a > slightly modified form -- probably you had them locally, rebased a few > commits from plt/master, then pushed them, and robby/plt never got > updated to reflect the rebase. The "Nothing to do" indicates those > diffs are reflected in plt/master, so you probably don't need to worry > about them. > > If you have gitk or gitg you can run them to check if master is the > same revision as plt/master, or you can run "git log plt/master..HEAD" > to see if you have any lingering commits. But I think you don't. In > any event, you can resync robby/plt to what you currently have by > running:
git log plt/master..HEAD didn't print anything out. But I'm not quite understanding what this 53 message is saying to me and I'd like to try. I've opened gitk and I see that there was this commit: commit 69963a1f2c50c902a174af45b96aa21d2d79a6d6 Author: Mike Sperber <sper...@deinprogramm.de> Date: Thu Jan 6 13:53:51 2011 +0100 Fix bug in struct-wrap signature checking. Only check the fields if we know the struct type is right. that is off on its own side path. Ie my graph looks like this: o improve canvas drawing docs | o Merge remote branch origin (committer Sperber) /| / | | o | | | 73 commits (why 73?!) | | | o like f57b431c2e6466c (missed other case) * | \ | \| o New Racket version 5.0.99.6 where the * is the commit mentioned above. > git push --force I assume that even with the information above, this is still sounding like the right thing? ... and now I've opened gitk in another, regular copy of the plt tree and I see the exact same graph. So I've re-read that first paragraph you wrote and I'm sure it contains the answer I seek, but I don't yet understand it. Robby _________________________________________________ For list-related administrative tasks: http://lists.racket-lang.org/listinfo/dev