On Thu, 7 Jun 2012, Jed Brown wrote: > On Thu, Jun 7, 2012 at 3:45 PM, Satish Balay <balay at mcs.anl.gov> 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] Satish [balay at maverick petsc-buildsystem-dev]$ hg -q in -S 23599:7c0333892302 23600:007d9928edc8 2828:1c53f750b541 2829:6548b4f26bd1 2830:03ab1f7aeb3a 2831:6ab6f1ae4aff [balay at maverick petsc-buildsystem-dev]$ hg -q out -S [balay at maverick petsc-buildsystem-dev]$ hg st -S M config/BuildSystem/config/packages/BlasLapack.py M config/examples/asterix/asterix64.py [balay at maverick petsc-buildsystem-dev]$ hg -R config/BuildSystem pull -u running ssh petsc at petsc.cs.iit.edu 'hg -R /home/petsc/BuildSystem-subrepo serve --stdio' pulling from ssh://petsc at petsc.cs.iit.edu//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 at maverick petsc-buildsystem-dev]$ hg pull -u running ssh petsc at petsc.cs.iit.edu 'hg -R /home/petsc/petsc-buildsystem-dev serve --stdio' pulling from ssh://petsc at petsc.cs.iit.edu//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 at maverick petsc-buildsystem-dev]$ hg st -S M .hgsubstate M config/BuildSystem/config/packages/BlasLapack.py M config/examples/asterix/asterix64.py [balay at maverick petsc-buildsystem-dev]$
