There was a question earlier today on an internal IRC channel from
someone who didn't understand why "hg stat" was showing modified files.
It turns out that he had local committed changes; nightly(1) had done a
pull and then invoked "hg merge" for him. The log file had the usual
1-line reminder from "hg merge" for him to do a commit, but it looks
like he missed it.
...
pulling from ssh://onnv.sfbay.sun.com//export/onnv-clone
searching for changes
adding changesets
adding manifests
adding file changes
added 12 changesets with 21 changes to 21 files (+1 heads)
not updating, since new heads added
(run 'hg heads' to see heads, 'hg merge' to merge)
remote: Not trusting file /export/onnv-clone/.hg/hgrc from untrusted user
onhg, group gk
21 files updated, 0 files merged, 1 files removed, 0 files unresolved
(branch merge, don't forget to commit)
...
I remembered that Mark had added a second, noisier warning to
nightly(1), but it didn't appear in this case. This is apparently
because the noisier warning only gets issued if Mercurial actually
merged a file.
2287 if grep "^merging" $TMPDIR/pull_open.out >/dev/null 2>&1; then
2288 printf "$mergepassmsg"
2289 fi
That didn't happen here, so no message.
I'm not sure we want to do anything about this, other than see if it
continues to be a point of confusion, but I thought I'd mention it.
mike
