Mercurial > hg
view tests/test-pull-branch.t @ 25591:f1d46075b13a
verify: check the subrepository references in .hgsubstate
While hopefully atypical, there are reasons that a subrepository revision can be
lost that aren't covered by corruption of the .hgsubstate revlog. Such things
can happen when a subrepo is amended, stripped or simply isn't pulled from
upstream because the parent repo revision wasn't updated yet. There's no way to
know if it is an error, but this will find potential problems sooner than when
some random revision is updated.
Until recently, convert made no attempt at rewriting the .hgsubstate file. The
impetuous for this is to verify the conversion of some repositories, and this is
orders of magnitude faster than a bash script from 0..tip that does an
'hg update -C $rev'. But it is equally useful to determine if everything has
been pulled down before taking a thumb drive on the go.
It feels somewhat wrong to leave this out of verifymod (mostly because the file
is already read in there, and the final summary is printed before the subrepos
are checked). But verifymod looks very low level, so importing subrepo stuff
there seems more wrong.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Tue, 16 Jun 2015 16:15:15 -0400 |
| parents | 701df761aa94 |
| children | ca2a0a654f54 |
line wrap: on
line source
$ hg init t $ cd t $ echo 1 > foo $ hg ci -Am1 # 0 adding foo $ hg branch branchA marked working directory as branch branchA (branches are permanent and global, did you want a bookmark?) $ echo a1 > foo $ hg ci -ma1 # 1 $ cd .. $ hg init tt $ cd tt $ hg pull ../t pulling from ../t requesting all changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files (run 'hg update' to get a working copy) $ hg up branchA 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd ../t $ echo a2 > foo $ hg ci -ma2 # 2 Create branch B: $ hg up 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg branch branchB marked working directory as branch branchB $ echo b1 > foo $ hg ci -mb1 # 3 $ cd ../tt A new branch is there $ hg pull -u ../t pulling from ../t searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files (+1 heads) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Develop both branches: $ cd ../t $ hg up branchA 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a3 > foo $ hg ci -ma3 # 4 $ hg up branchB 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo b2 > foo $ hg ci -mb2 # 5 $ cd ../tt Should succeed, no new heads: $ hg pull -u ../t pulling from ../t searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 1 files 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Add a head on other branch: $ cd ../t $ hg up branchA 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a4 > foo $ hg ci -ma4 # 6 $ hg up branchB 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo b3.1 > foo $ hg ci -m b3.1 # 7 $ hg up 5 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo b3.2 > foo $ hg ci -m b3.2 # 8 created new head $ cd ../tt Should succeed because there is only one head on our branch: $ hg pull -u ../t pulling from ../t searching for changes adding changesets adding manifests adding file changes added 3 changesets with 3 changes to 1 files (+1 heads) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd ../t $ hg up -C branchA 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a5.1 > foo $ hg ci -ma5.1 # 9 $ hg up 6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a5.2 > foo $ hg ci -ma5.2 # 10 created new head $ hg up 7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo b4.1 > foo $ hg ci -m b4.1 # 11 $ hg up -C 8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo b4.2 > foo $ hg ci -m b4.2 # 12 $ cd ../tt $ hg pull -u ../t pulling from ../t searching for changes adding changesets adding manifests adding file changes added 4 changesets with 4 changes to 1 files (+1 heads) 1 files updated, 0 files merged, 0 files removed, 0 files unresolved Make changes on new branch on tt $ hg up 6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg branch branchC marked working directory as branch branchC $ echo b1 > bar $ hg ci -Am "commit on branchC on tt" adding bar Make changes on default branch on t $ cd ../t $ hg up -C default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a1 > bar $ hg ci -Am "commit on default on t" adding bar Pull branchC from tt $ hg pull ../tt pulling from ../tt searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads) Make changes on default and branchC on tt $ cd ../tt $ hg pull ../t pulling from ../t searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) (run 'hg heads' to see heads) $ hg up -C default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a1 > bar1 $ hg ci -Am "commit on default on tt" adding bar1 $ hg up branchC 2 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo a1 > bar2 $ hg ci -Am "commit on branchC on tt" adding bar2 Make changes on default and branchC on t $ cd ../t $ hg up default 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo a1 > bar3 $ hg ci -Am "commit on default on t" adding bar3 $ hg up branchC 2 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo a1 > bar4 $ hg ci -Am "commit on branchC on tt" adding bar4 Pull from tt $ hg pull ../tt pulling from ../tt searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+2 heads) (run 'hg heads .' to see heads, 'hg merge' to merge) $ cd ..