135 |
135 |
136 Test obsolete keyword |
136 Test obsolete keyword |
137 |
137 |
138 $ hg glog --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n' \ |
138 $ hg glog --template '{rev}:{node|short}@{branch}({obsolete}/{phase}) {desc|firstline}\n' \ |
139 > --hidden |
139 > --hidden |
140 @ 5:a7a6f2b5d8a5@default(unstable/secret) add d |
140 @ 5:a7a6f2b5d8a5@default(unstable/draft) add d |
141 | |
141 | |
142 | o 4:725c380fe99b@default(stable/draft) add obsol_c' |
142 | o 4:725c380fe99b@default(stable/draft) add obsol_c' |
143 | | |
143 | | |
144 x | 3:0d3f46688ccc@default(suspended/secret) add obsol_c |
144 x | 3:0d3f46688ccc@default(suspended/draft) add obsol_c |
145 |/ |
145 |/ |
146 | x 2:4538525df7e2@default(extinct/secret) add c |
146 | x 2:4538525df7e2@default(extinct/draft) add c |
147 |/ |
147 |/ |
148 o 1:7c3bad9141dc@default(stable/draft) add b |
148 o 1:7c3bad9141dc@default(stable/draft) add b |
149 | |
149 | |
150 o 0:1f0dee641bb7@default(stable/public) add a |
150 o 0:1f0dee641bb7@default(stable/public) add a |
151 |
151 |
152 |
152 |
153 Test communication of obsolete relation with a compatible client |
153 Test communication of obsolete relation with a compatible client |
154 |
154 |
155 $ hg init ../other-new |
155 $ hg init ../other-new |
156 $ hg phase --draft 'secret() - extinct()' # until we fix exclusion |
156 $ hg phase --draft 'secret() - extinct()' # until we fix exclusion |
|
157 abort: empty revision set |
|
158 [255] |
157 $ hg push ../other-new |
159 $ hg push ../other-new |
158 pushing to ../other-new |
160 pushing to ../other-new |
159 searching for changes |
161 searching for changes |
160 abort: push includes an unstable changeset: a7a6f2b5d8a5! |
162 abort: push includes an unstable changeset: a7a6f2b5d8a5! |
161 (use 'hg stabilize' to get a stable history (or --force to proceed)) |
163 (use 'hg stabilize' to get a stable history (or --force to proceed)) |
238 Pushing again does not advertise extinct changeset |
240 Pushing again does not advertise extinct changeset |
239 |
241 |
240 $ hg push ../other-new |
242 $ hg push ../other-new |
241 pushing to ../other-new |
243 pushing to ../other-new |
242 searching for changes |
244 searching for changes |
243 no changes found (ignored 2 secret changesets) |
245 no changes found |
244 [1] |
246 [1] |
245 |
247 |
246 $ hg up -q .^ # 3 |
248 $ hg up -q .^ # 3 |
247 Working directory parent is obsolete |
249 Working directory parent is obsolete |
248 $ mkcommit "obsol_d'" # 7 |
250 $ mkcommit "obsol_d'" # 7 |
303 |
305 |
304 clone support |
306 clone support |
305 |
307 |
306 $ hg clone . ../cloned |
308 $ hg clone . ../cloned |
307 > # The warning should go away once we have default value to set ready before we pull |
309 > # The warning should go away once we have default value to set ready before we pull |
308 requesting all changes |
|
309 adding changesets |
|
310 adding manifests |
|
311 adding file changes |
|
312 added 5 changesets with 5 changes to 5 files (+1 heads) |
|
313 updating to branch default |
310 updating to branch default |
314 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
311 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
315 |
312 |
316 $ qlog -R ../cloned |
313 $ qlog -R ../cloned |
317 4 |
314 7 |
318 - 909a0fb57e5d |
315 - 909a0fb57e5d |
319 3 |
316 6 |
320 - 725c380fe99b |
317 - 95de7fc6918d |
321 2 |
318 5 |
322 - 0d3f46688ccc |
319 - a7a6f2b5d8a5 |
|
320 4 |
|
321 - 725c380fe99b |
|
322 3 |
|
323 - 0d3f46688ccc |
|
324 2 |
|
325 - 4538525df7e2 |
323 1 |
326 1 |
324 - 7c3bad9141dc |
327 - 7c3bad9141dc |
325 0 |
328 0 |
326 - 1f0dee641bb7 |
329 - 1f0dee641bb7 |
327 |
330 |