On Thu, Nov 06, 2008 at 05:06:04PM +0000, Stacey Jonathan Marshall wrote:
> The last two are a couple of the ones your interested in from previous
> email.
> So whats in your ignore file:
>
> kebe(5.11-64i)$ grep -v ^\# /home/danmcd/ws/bugfixes/.hgignore
> syntax: glob
> *
>
> Eek, your telling it to ignore everything?
That's what it says, but I managed to commit the sadb.c change, just not the
sadb.h or ip_sadb.c change.
> I think that might be the issue here.
> Also, I think 'hg outgoing' only shows committed files.
I couldn't even COMMIT the changes to ip_sadb.c and sadb.h. And even now:
kebe(inet/ip)[0]% history |tail
71 11:35 hg status
72 11:51 cd
73 11:59 ssh everywhere
74 12:10 cd ws/bugfixes
75 12:10 mv .hgignore .hgignore-NOTNOW
76 12:10 cd usr/src/uts/common/inet/ip
77 12:10 ls
78 12:10 hg commit
79 12:10 history
80 12:10 history | tail
kebe(inet/ip)[0]% hg commit
nothing changed
kebe(inet/ip)[0]% diff ip_sadb.c ~/zclones/onnv/usr/src/uts/common/inet/ip
724,726c724,726
< if (assoc->ipsa_state == IPSA_STATE_LARVAL &&
< sadb_set_lpkt(assoc, ipsec_in, ns)) {
< /* Not fully baked - swap the packet under a rock until then */
---
> if (assoc->ipsa_state == IPSA_STATE_LARVAL) {
> /* Not fully baked; swap the packet under a rock until then */
> sadb_set_lpkt(assoc, ipsec_in, ns);
865,866c865
< if (ipsa->ipsa_state == IPSA_STATE_LARVAL &&
< sadb_set_lpkt(ipsa, ipsec_in_mp, ns)) {
---
> if (ipsa->ipsa_state == IPSA_STATE_LARVAL) {
867a867
> sadb_set_lpkt(ipsa, ipsec_in_mp, ns);
kebe(inet/ip)[1]%
So there's something even screwier going on.
One thing... when I did the initial "hg commit" I was in "ws mode", where my
$PATH is different:
kebe(inet/ip)[1]% echo $PATH
/usr/X11/bin:/usr/dt/bin:/usr/local/bin:/opt/SUNWspro/SS12/bin:/opt/onbld/bin:/opt/teamware/bin:/usr/ccs/bin:/usr/ucb:/usr/bin:/usr/sbin:/pkg/gnu/bin:/pkg/local/bin:/pkg/X11/bin:/opt/texmf/bin:/pkg/ssh/bin:/pkg/news/bin:/pkg/usrdist/bin:/pkg/isv/bin:/usr/dist/local/exe:/usr/dist/exe:/usr/lib:/usr/lib/nis:/usr/lib/netsvc/yp:/net/new-atlantic.east/export/shared/bin:/home/danmcd/bin
kebe(inet/ip)[0]% ws
Defaulting to mercurial repository /home/danmcd/ws/bugfixes
Workspace : /home/danmcd/ws/bugfixes
Workspace Parent : /home/danmcd/zclones/onnv
Proto area ($ROOT) : /home/danmcd/ws/bugfixes/proto/root_i386
Parent proto area ($PARENT_ROOT) : /home/danmcd/zclones/onnv/proto/root_i386
Root of source ($SRC) : /home/danmcd/ws/bugfixes/usr/src
Root of test source ($TSRC) : /home/danmcd/ws/bugfixes/usr/ontest
Current directory ($PWD) : /home/danmcd/ws/bugfixes
WS-kebe-WS(~/ws/bugfixes)[0]% echo $PATH
/usr/sbin:/opt/SUNWspro/SS12/bin:/opt/onbld/bin:/opt/teamware/bin:/usr/ccs/bin:/usr/bin:/usr/X11/bin:/usr/dt/bin:/usr/local/bin:/usr/ucb:/pkg/gnu/bin:/pkg/local/bin:/pkg/X11/bin:/opt/texmf/bin:/pkg/ssh/bin:/pkg/news/bin:/pkg/usrdist/bin:/pkg/isv/bin:/usr/dist/local/exe:/usr/dist/exe:/usr/lib:/usr/lib/nis:/usr/lib/netsvc/yp:/net/new-atlantic.east/export/shared/bin:/home/danmcd/bin
WS-kebe-WS(~/ws/bugfixes)[0]%
Dan
