On Wed, 6 Jun 2012, Satish Balay wrote: > ssh://petsc at petsc.cs.iit.edu//home/petsc/petsc-buildsystem-dev > > Just to clarify - this is a play-repo - i.e all edits/clones should be > discarded later on.
ok - rebase behaves differently with subrepos. How is it supporsed to work? With separate repos - I can do: hg commit [local changes] hg pull --rebase [automatically rebases the commit hg push With sub-repos - I see the following: Satish -------- [balay at maverick petsc-buildsystem-dev]$ hg version Mercurial Distributed SCM (version 2.2.1) [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 st -S [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 status -S M config/BuildSystem/config/packages/BlasLapack.py M config/examples/asterix/asterix64.py [balay at maverick petsc-buildsystem-dev]$ hg commit -S committing subrepository config/BuildSystem config/packages/BlasLapack.py .hgsubstate config/examples/asterix/asterix64.py committed changeset 23599:a7b4f38e3075 [balay at maverick petsc-buildsystem-dev]$ hg -q out -S 23599:a7b4f38e3075 2828:358afb29fe48 [balay at maverick petsc-buildsystem-dev]$ hg pull --rebase 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 adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 2 files (+1 heads) resolving manifests getting .hgsubstate 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 adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 4 files (+1 heads) resolving manifests getting config/packages/BlasLapack.py getting config/setCompilers.py getting jeff getting joe getting urlMappingLocal.py getting config/examples/asterix/asterix64.py getting makefile resolving manifests resolving manifests getting config/packages/BlasLapack.py 1 files updated, 0 files merged, 0 files removed, 0 files unresolved getting config/examples/asterix/asterix64.py abort: uncommitted changes in subrepo config/BuildSystem (use --subrepos for recursive commit) [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 -q heads -R config/BuildSystem 2832:6ab6f1ae4aff 2828:358afb29fe48 [balay at maverick petsc-buildsystem-dev]$ hg -q heads 23601:007d9928edc8 23599:a7b4f38e3075 [balay at maverick petsc-buildsystem-dev]$
