equal
deleted
inserted
replaced
48 warning: subrepo spec file 'repo/.hgsub' not found |
48 warning: subrepo spec file 'repo/.hgsub' not found |
49 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
49 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
50 $ hg st |
50 $ hg st |
51 warning: subrepo spec file '.hgsub' not found |
51 warning: subrepo spec file '.hgsub' not found |
52 ! .hgsub |
52 ! .hgsub |
53 $ ls subrepo |
53 $ ls -A subrepo |
|
54 .hg |
54 a |
55 a |
55 |
56 |
56 delete .hgsubstate and update |
57 delete .hgsubstate and update |
57 |
58 |
58 $ hg up -C |
59 $ hg up -C |
63 $ hg up 0 |
64 $ hg up 0 |
64 other [destination] changed .hgsubstate which local [working copy] deleted |
65 other [destination] changed .hgsubstate which local [working copy] deleted |
65 use (c)hanged version or leave (d)eleted? c |
66 use (c)hanged version or leave (d)eleted? c |
66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
67 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
67 $ hg st |
68 $ hg st |
68 $ ls subrepo |
69 $ ls -A subrepo |
|
70 .hg |
69 a |
71 a |
70 |
72 |
71 Enable obsolete |
73 Enable obsolete |
72 |
74 |
73 $ cat >> $HGRCPATH << EOF |
75 $ cat >> $HGRCPATH << EOF |
132 checking subrepo links |
134 checking subrepo links |
133 0: repository $TESTTMP/repo/subrepo not found |
135 0: repository $TESTTMP/repo/subrepo not found |
134 1: repository $TESTTMP/repo/subrepo not found |
136 1: repository $TESTTMP/repo/subrepo not found |
135 3: repository $TESTTMP/repo/subrepo not found |
137 3: repository $TESTTMP/repo/subrepo not found |
136 4: repository $TESTTMP/repo/subrepo not found |
138 4: repository $TESTTMP/repo/subrepo not found |
137 $ ls |
139 $ ls -A |
|
140 .hg |
|
141 .hgsub |
|
142 .hgsubstate |
138 b |
143 b |
139 $ mv b subrepo |
144 $ mv b subrepo |
140 |
145 |
141 $ cd .. |
146 $ cd .. |