Miscellany

[stevel@donuthole:onnv-scm.merge] 513$ hg pull -u -r onnv_61 /net/tonic-gate/builds/onnv-gate
pulling from /net/tonic-gate/builds/onnv-gate
searching for changes
adding changesets
adding manifests
adding file changes
added 93 changesets with 700 changes to 665 files (+1 heads)
not updating, since new heads added
(run 'hg heads' to see heads, 'hg merge' to merge)
[stevel@donuthole:onnv-scm.merge] 514$ hg heads
changeset:   3947:19804e7fd496
tag:         tip
user:        ml29623
date:        Mon Mar 19 19:37:22 2007 -0700
summary:     PSARC 2006/665 Neptune 10 Gbit Ethernet Driver

changeset:   3854:fd743f5bd5a5
user:        Richard Lowe <richlowe@richlowe.net>
date:        Mon Mar 12 16:09:22 2007 -0400
summary:     139 Comments check should only check first 40 chars of ARC cases

[stevel@donuthole:onnv-scm.merge] 518$ hg merge
merging usr/src/tools/Makefile
merging usr/src/tools/SUNWonbld/prototype_com
merging usr/src/tools/scripts/nightly.sh
661 files updated, 3 files merged, 76 files removed, 0 files unresolved
(branch merge, don't forget to commit)
[stevel@donuthole:onnv-scm.merge] 520$ hg st usr/src/cmd/sa/Makefile
[stevel@donuthole:onnv-scm.merge] 522$ hg st | grep "cmd/sa"
[stevel@donuthole:onnv-scm.merge] 523$ hg commit -m "sync with onnv_61"
[stevel@donuthole:onnv-scm.merge] 524$ hg log -l 2
changeset:   3948:92bb468dae10
tag:         tip
parent:      3854:fd743f5bd5a5
parent:      3947:19804e7fd496
user:        Stephen Lau <stevel@sun.com>
date:        Wed Mar 21 16:12:58 2007 -0700
summary:     sync with onnv_61

changeset:   3947:19804e7fd496
user:        ml29623
date:        Mon Mar 19 19:37:22 2007 -0700
summary:     PSARC 2006/665 Neptune 10 Gbit Ethernet Driver

[stevel@donuthole:onnv-scm.merge] 525$ hg st --rev 3947:3948 | grep "cmd/sa"
M usr/src/cmd/sa/Makefile
M usr/src/cmd/sa/timex.c
[stevel@donuthole:onnv-scm.merge] 526$ hg log usr/src/cmd/sa/Makefile|less
changeset:   3270:747c64b08dbf
user:        dduvall
date:        Wed Dec 13 17:51:32 2006 -0800
summary:     backout 6451790: needs more work

changeset:   3260:511be7c5dbd8
user:        as158974
date:        Wed Dec 13 02:50:28 2006 -0800
summary:     6451790 timex need to be compiled in 64 bit, to prevent overflows

changeset:   3048:ce5ba5995ea4
user:        amaguire
date:        Thu Nov 02 15:30:18 2006 -0800
summary:     PSARC 2006/552 Quagga SMF Modifications

changeset:   0:68f95e015346
user:        stevel@tonic-gate
date:        Tue Jun 14 00:00:00 2005 -0700
summary:     OpenSolaris Launch

0[stevel@donuthole:onnv-scm.merge] 527$