On Thu, 7 Jun 2012, Satish Balay wrote: > Another issue: > > I make edits to both petsc-dev and BuildSystem. But before commiting I > can usually do 'hg pull -u' in each repo [for the usual automerge > case] > > With subrepo - without commits/changes - I can do 'hg pull -u' and it > goes recursively. But if I do the same with local edits [not commits] > - I get the following: > > [So I should know the state of buildsystem - before invoking 'hg pull > -u' in petsc-dev - and use it only if no changes in BuildSystem?] > > Satish > > --------- > > [balay at maverick petsc-buildsystem-dev]$ hg st -S > [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]$ vi > config/examples/asterix/asterix64.py > config/BuildSystem/config/packages/BlasLapack.py > 2 files to edit > [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 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 > running ssh petsc at petsc.cs.iit.edu 'hg -R /home/petsc/BuildSystem-subrepo > serve --stdio' > pulling subrepo config/BuildSystem 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 > subrepository sources for config/BuildSystem differ > use (l)ocal source (eadaa286b5ca) or (r)emote source (6ab6f1ae4aff)?
Ok - I have to choose 'r' here for what I want [wrt diff/auto-merge]. [balay at maverick petsc-buildsystem-dev]$ hg stat -S M .hgsubstate M config/BuildSystem/config/packages/BlasLapack.py M config/examples/asterix/asterix64.py [balay at maverick petsc-buildsystem-dev]$ But for some reason '.hgsubstate' is not updated [to correspond to 'hg pull -u' version]. Hm.. Satish
