equal
deleted
inserted
replaced
231 |
231 |
232 (amend of public changeset denied) |
232 (amend of public changeset denied) |
233 |
233 |
234 $ hg phase --public 0 -v |
234 $ hg phase --public 0 -v |
235 phase changed for 1 changesets |
235 phase changed for 1 changesets |
236 $ hg amend -c 2 |
236 $ hg amend -c 4 |
237 abort: cannot amend non ancestor changeset |
237 abort: cannot amend non ancestor changeset |
238 [255] |
238 [255] |
239 |
239 |
240 |
240 |
241 (amend of on ancestors) |
241 (amend of on ancestors) |
242 |
|
243 $ hg amend -c 2 |
|
244 abort: cannot amend non ancestor changeset |
|
245 [255] |
|
246 |
242 |
247 $ hg amend --note 'french looks better' |
243 $ hg amend --note 'french looks better' |
248 1 new unstable changesets |
244 1 new unstable changesets |
249 $ hg log |
245 $ hg log |
250 6 feature-A: a nifty feature - test |
246 6 feature-A: a nifty feature - test |
296 6 feature-A: a nifty feature - test |
292 6 feature-A: a nifty feature - test |
297 0 : base - test |
293 0 : base - test |
298 |
294 |
299 phase change turning obsolete changeset public issue a bumped warning |
295 phase change turning obsolete changeset public issue a bumped warning |
300 |
296 |
301 $ hg phase --public 7 |
297 $ hg phase --hidden --public 7 |
302 1 new bumped changesets |
298 1 new bumped changesets |
303 |
299 |
304 all solving bumped troubled |
300 all solving bumped troubled |
305 |
301 |
306 $ hg glog |
302 $ hg glog |
324 | |
320 | |
325 o 6 feature-A: a nifty feature - test |
321 o 6 feature-A: a nifty feature - test |
326 | |
322 | |
327 o 0 : base - test |
323 o 0 : base - test |
328 |
324 |
329 $ hg diff -r 9 -r 8 |
325 $ hg diff --hidden -r 9 -r 8 |
330 $ hg diff -r 9^ -r 9 |
326 $ hg diff -r 9^ -r 9 |
331 diff --git a/main-file-1 b/main-file-1 |
327 diff --git a/main-file-1 b/main-file-1 |
332 --- a/main-file-1 |
328 --- a/main-file-1 |
333 +++ b/main-file-1 |
329 +++ b/main-file-1 |
334 @@ -3,1 +3,1 @@ |
330 @@ -3,1 +3,1 @@ |
391 checking manifests |
387 checking manifests |
392 crosschecking files in changesets and manifests |
388 crosschecking files in changesets and manifests |
393 checking files |
389 checking files |
394 3 files, 4 changesets, 4 total revisions |
390 3 files, 4 changesets, 4 total revisions |
395 $ hg --config extensions.hgext.mq= strip 'extinct()' |
391 $ hg --config extensions.hgext.mq= strip 'extinct()' |
|
392 abort: empty revision set |
|
393 [255] |
|
394 $ hg --config extensions.hgext.mq= strip --hidden 'extinct()' |
396 saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-backup.hg |
395 saved backup bundle to $TESTTMP/alpha/.hg/strip-backup/e87767087a57-backup.hg |
397 $ hg verify |
396 $ hg verify |
398 checking changesets |
397 checking changesets |
399 checking manifests |
398 checking manifests |
400 crosschecking files in changesets and manifests |
399 crosschecking files in changesets and manifests |