On Thu, 7 Jun 2012, Jed Brown wrote: > On Thu, Jun 7, 2012 at 1:28 AM, Satish Balay <balay at mcs.anl.gov> wrote: > > > 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 > > > > The rebase is not applied recursively in subrepos. Compare what we have now: > > remember to go into config/BuildSystem, pull, merge or rebase, and push > > to how it works with sebrepos: > > If you naively pull, but there is a subrepo conflict, it will error. That > tells you that you have to go into config/BuildSystem, pull, and merge. > Once you do that and commit to petsc, BuildSystem will automatically be > carried along on subsequent pushes, etc.
Right now - with 2 repos - I can use rebase [in both repos separately] But if we switch to subrepos - then I can't use rebase - and always use merge? Satish -------- [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:a9a8d40da950 [balay at maverick petsc-buildsystem-dev]$ hg push pushing to ssh://petsc at petsc.cs.iit.edu//home/petsc/petsc-buildsystem-dev running ssh petsc at petsc.cs.iit.edu 'hg -R /home/petsc/petsc-buildsystem-dev serve --stdio' pushing subrepo config/BuildSystem to ssh://petsc at petsc.cs.iit.edu//home/petsc/BuildSystem-subrepo running ssh petsc at petsc.cs.iit.edu 'hg -R /home/petsc/BuildSystem-subrepo serve --stdio' searching for changes new remote heads on branch 'default' new remote head 2bb21b50ee60 abort: push creates new remote head 2bb21b50ee60! (you should pull and merge or use push -f to force) [balay at maverick petsc-buildsystem-dev]$ cd config/BuildSystem/ [balay at maverick BuildSystem]$ hg pull --rebase 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 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 resolving manifests getting config/packages/BlasLapack.py config/packages/BlasLapack.py rebase merging completed 1 changesets found saved backup bundle to /home/balay/petsc-buildsystem-dev/config/BuildSystem/.hg/strip-backup/2bb21b50ee60-backup.hg 5 changesets found adding branch adding changesets adding manifests adding file changes added 5 changesets with 5 changes to 5 files rebase completed [balay at maverick BuildSystem]$ cd ../.. [balay at maverick petsc-buildsystem-dev]$ hg pull --rebase abort: uncommitted changes in subrepo config/BuildSystem [balay at maverick petsc-buildsystem-dev]$ hg st -S warning: error "unknown revision '2bb21b50ee6020c5a8608742da2b0c8da0212510'" in subrepository "config/BuildSystem" [balay at maverick petsc-buildsystem-dev]$ >>>>>>>>>>. ok - perhaps the rebase in buildsystem means - a new commit in >>>>>>>>>>petsc-buildsystem-dev? <<<<<<<< [balay at maverick petsc-buildsystem-dev]$ hg commit .hgsubstate committed changeset 23600:cd90aa80d97d [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 sampling from both directions adding changesets adding manifests adding file changes added 2 changesets with 3 changes to 2 files (+1 heads) resolving manifests getting .hgsubstate resolving manifests getting config/packages/BlasLapack.py getting config/examples/asterix/asterix64.py getting makefile 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 no changes found abort: unknown revision '2bb21b50ee6020c5a8608742da2b0c8da0212510'! [balay at maverick petsc-buildsystem-dev]$ ls config/packages/BlasLapack.py ls: cannot access config/packages/BlasLapack.py: No such file or directory [balay at maverick petsc-buildsystem-dev]$ hg st -S [balay at maverick petsc-buildsystem-dev]$ hg -q heads 23602:007d9928edc8 23600:cd90aa80d97d [balay at maverick petsc-buildsystem-dev]$ >>>>>>>>>>. ok - perhaps BuildSystem should never be rebased <<<<<<<<<<<<<<<<<
