equal
deleted
inserted
replaced
66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
67 $ hg st |
67 $ hg st |
68 $ ls subrepo |
68 $ ls subrepo |
69 a |
69 a |
70 |
70 |
|
71 Enable obsolete |
|
72 |
|
73 $ cat > ${TESTTMP}/obs.py << EOF |
|
74 > import mercurial.obsolete |
|
75 > mercurial.obsolete._enabled = True |
|
76 > EOF |
|
77 $ cat >> $HGRCPATH << EOF |
|
78 > [ui] |
|
79 > logtemplate= {rev}:{node|short} {desc|firstline} |
|
80 > [phases] |
|
81 > publish=False |
|
82 > [extensions]' |
|
83 > obs=${TESTTMP}/obs.py |
|
84 > EOF |
|
85 |
|
86 check that we can update parent repo with missing (amended) subrepo revision |
|
87 |
|
88 $ hg up --repository subrepo -r tip |
|
89 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
90 $ hg ci -m "updated subrepo to tip" |
|
91 created new head |
|
92 $ cd subrepo |
|
93 $ hg update -r tip |
|
94 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
95 $ echo foo > a |
|
96 $ hg commit --amend -m "addb (amended)" |
71 $ cd .. |
97 $ cd .. |
|
98 $ hg update --clean . |
|
99 revision 102a90ea7b4a in subrepo subrepo is hidden |
|
100 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
101 |
|
102 $ cd .. |