test-subrepo-missing.t
102 lines
| 2.5 KiB
| text/troff
|
Tads3Lexer
/ tests / test-subrepo-missing.t
|
r13017 | $ hg init repo | ||
$ cd repo | ||||
$ hg init subrepo | ||||
$ echo a > subrepo/a | ||||
$ hg -R subrepo ci -Am adda | ||||
adding a | ||||
$ echo 'subrepo = subrepo' > .hgsub | ||||
$ hg ci -Am addsubrepo | ||||
adding .hgsub | ||||
$ echo b > subrepo/b | ||||
$ hg -R subrepo ci -Am addb | ||||
adding b | ||||
$ hg ci -m updatedsub | ||||
|
r16595 | ignore blanklines in .hgsubstate | ||
>>> file('.hgsubstate', 'wb').write('\n\n \t \n \n') | ||||
$ hg st --subrepos | ||||
M .hgsubstate | ||||
$ hg revert -qC .hgsubstate | ||||
|
r16596 | abort more gracefully on .hgsubstate parsing error | ||
$ cp .hgsubstate .hgsubstate.old | ||||
>>> file('.hgsubstate', 'wb').write('\ninvalid') | ||||
$ hg st --subrepos | ||||
abort: invalid subrepository revision specifier in .hgsubstate line 2 | ||||
[255] | ||||
$ mv .hgsubstate.old .hgsubstate | ||||
|
r13017 | delete .hgsub and revert it | ||
$ rm .hgsub | ||||
$ hg revert .hgsub | ||||
warning: subrepo spec file .hgsub not found | ||||
|
r14870 | warning: subrepo spec file .hgsub not found | ||
|
r13017 | |||
delete .hgsubstate and revert it | ||||
$ rm .hgsubstate | ||||
$ hg revert .hgsubstate | ||||
delete .hgsub and update | ||||
$ rm .hgsub | ||||
$ hg up 0 | ||||
warning: subrepo spec file .hgsub not found | ||||
|
r14870 | warning: subrepo spec file .hgsub not found | ||
|
r13017 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
$ hg st | ||||
|
r14870 | warning: subrepo spec file .hgsub not found | ||
|
r13017 | ! .hgsub | ||
$ ls subrepo | ||||
a | ||||
delete .hgsubstate and update | ||||
$ hg up -C | ||||
warning: subrepo spec file .hgsub not found | ||||
|
r14870 | warning: subrepo spec file .hgsub not found | ||
|
r13017 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||
$ rm .hgsubstate | ||||
|
r17345 | $ hg up 0 | ||
|
r13017 | remote changed .hgsubstate which local deleted | ||
use (c)hanged version or leave (d)eleted? c | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg st | ||||
$ ls subrepo | ||||
a | ||||
|
r16913 | |||
|
r20319 | Enable obsolete | ||
$ cat > ${TESTTMP}/obs.py << EOF | ||||
> import mercurial.obsolete | ||||
> mercurial.obsolete._enabled = True | ||||
> EOF | ||||
$ cat >> $HGRCPATH << EOF | ||||
> [ui] | ||||
> logtemplate= {rev}:{node|short} {desc|firstline} | ||||
> [phases] | ||||
> publish=False | ||||
> [extensions]' | ||||
> obs=${TESTTMP}/obs.py | ||||
> EOF | ||||
check that we can update parent repo with missing (amended) subrepo revision | ||||
$ hg up --repository subrepo -r tip | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ hg ci -m "updated subrepo to tip" | ||||
created new head | ||||
$ cd subrepo | ||||
$ hg update -r tip | ||||
0 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ echo foo > a | ||||
$ hg commit --amend -m "addb (amended)" | ||||
|
r16913 | $ cd .. | ||
|
r20319 | $ hg update --clean . | ||
revision 102a90ea7b4a in subrepo subrepo is hidden | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
$ cd .. | ||||