-------- Original-Nachricht -------- Datum: Fri, 22 Aug 2008 15:03:06 +0200 Von: "Martin Bochnig" <mb1x at gmx.com> An: fox-notify at opensolaris.org Betreff: [fox-notify] committed and pushed changes not reflected by fox-notify email
Not to speak of OpenGrok (OpenGrokk misses all my earlier initial changes). $ hg pull pulling from ssh://anon at hg.opensolaris.org/hg/fox/fox-gate searching for changes adding changesets adding manifests adding file changes added 1 changesets with 13 changes to 13 files (+1 heads) (run 'hg heads' to see heads, 'hg merge' to merge) bash-3.2$ hg heads changeset: 570:3e389e94170f tag: tip parent: 568:b42e5c9a518d user: ma54148 date: Wed Aug 20 13:34:40 2008 -0700 summary: 6736024 Replace xcolor with open src version changeset: 569:8be9215533ca user: bochnig at SunBlade-2000 date: Fri Aug 22 14:25:55 2008 +0200 summary: Cleaning up the sparcv8plus vs. sparcv9 build process and subdirs in xserver and driver. bash-3.2$ hg merge 13 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) bash-3.2$ hg commit No username found, using 'bochnig at SunBlade-2000' instead bash-3.2$ hg push ssh://bochnig at hg.opensolaris.org/hg/fox/fox-gate Enter passphrase for key '/export/home/bochnig/.ssh/id_dsa': pushing to ssh://bochnig at hg.opensolaris.org/hg/fox/fox-gate searching for changes remote: adding changesets remote: adding manifests remote: adding file changes remote: added 2 changesets with 11 changes to 11 files remote: Sending notification for 8be9215533ca83c1f54ed71a1606bb788781d802 remote: Sending notification for 39094d7b83eeaf7ef0b0b125df488f015eabbdab bash-3.2$ But it looks like my changes did make it into the repo, I also verified this in /tmp. But back to my workspace, current situation: bash-3.2$ date Fri Aug 22 15:00:44 MEST 2008 bash-3.2$ hg pull pulling from ssh://anon at hg.opensolaris.org/hg/fox/fox-gate searching for changes no changes found bash-3.2$ hg heads changeset: 571:39094d7b83ee tag: tip parent: 569:8be9215533ca parent: 570:3e389e94170f user: bochnig at SunBlade-2000 date: Fri Aug 22 14:32:00 2008 +0200 summary: "hg pull" and "hg merge" of my local chnages with "6736024 Replace xcolor with open src version" bash-3.2$ _______________________________________________ fox-notify mailing list fox-notify at opensolaris.org http://mail.opensolaris.org/mailman/listinfo/fox-notify
