On Thu, 7 Jun 2012, Satish Balay wrote:

On Thu, 7 Jun 2012, Jed Brown wrote:

...

On Thu, Jun 7, 2012 at 3:45 PM, Satish Balay <[email protected]> wrote:

...

This is a usage without commits - only local changes/edits - and then 'pull -u'

Okay, then I agree that this is awkward. Do you get a consistent state if you

$ hg -R config/BuildSystem pull -u $ hg pull -u

Same behavior as before [with .hgsubstate not updated - and showing as modified wrt current parent]

Here I'm attempting with the latest hg 2.2.2 [the earlier runs were with 2.2.1] - with the same result. One additional bit I notice. 'hg st -R config/BuildSystem' and 'hg st -S' - which I gues should be expected. [now thats one more bit of info to be aware off] Satish -------- [balay@maverick petsc-buildsystem-dev]$ hg st -S M config/BuildSystem/config/packages/BlasLapack.py M config/examples/asterix/asterix64.py [balay@maverick petsc-buildsystem-dev]$ hg -q in -S 23599:7c0333892302 23600:007d9928edc8 2828:1c53f750b541 2829:6548b4f26bd1 2830:03ab1f7aeb3a 2831:6ab6f1ae4aff [balay@maverick petsc-buildsystem-dev]$ hg -R config/BuildSystem pull -u running ssh [email protected] 'hg -R /home/petsc/BuildSystem-subrepo serve --stdio' pulling from ssh://[email protected]//home/petsc/BuildSystem-subrepo searching for changes all local heads known remotely adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 4 files resolving manifests getting config/setCompilers.py getting jeff getting joe getting urlMappingLocal.py 4 files updated, 0 files merged, 0 files removed, 0 files unresolved [balay@maverick petsc-buildsystem-dev]$ hg st -R config/BuildSystem M config/packages/BlasLapack.py [balay@maverick petsc-buildsystem-dev]$ hg st -S M config/BuildSystem/config/packages/BlasLapack.py M config/BuildSystem/config/setCompilers.py M config/BuildSystem/urlMappingLocal.py M config/examples/asterix/asterix64.py A config/BuildSystem/jeff A config/BuildSystem/joe [balay@maverick petsc-buildsystem-dev]$ hg pull -u running ssh [email protected] 'hg -R /home/petsc/petsc-buildsystem-dev serve --stdio' pulling from ssh://[email protected]//home/petsc/petsc-buildsystem-dev searching for changes all local heads known remotely adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 2 files resolving manifests resolving manifests 0 files updated, 0 files merged, 0 files removed, 0 files unresolved getting makefile 1 files updated, 0 files merged, 0 files removed, 0 files unresolved [balay@maverick petsc-buildsystem-dev]$ hg stat -S M .hgsubstate M config/BuildSystem/config/packages/BlasLapack.py M config/examples/asterix/asterix64.py [balay@maverick petsc-buildsystem-dev]$ hg stat -R config/BuildSystem/ M config/packages/BlasLapack.py [balay@maverick petsc-buildsystem-dev]$