equal
deleted
inserted
replaced
309 2 different branches: 2 strips |
309 2 different branches: 2 strips |
310 |
310 |
311 $ hg strip 2 4 |
311 $ hg strip 2 4 |
312 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
312 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
313 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
313 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
314 saved backup bundle to $TESTTMP/test/.hg/strip-backup/*-backup.hg (glob) |
|
315 $ hg glog |
314 $ hg glog |
316 @ changeset: 2:65bd5f99a4a3 |
315 @ changeset: 2:65bd5f99a4a3 |
317 | tag: tip |
316 | tag: tip |
318 | user: test |
317 | user: test |
319 | date: Thu Jan 01 00:00:00 1970 +0000 |
318 | date: Thu Jan 01 00:00:00 1970 +0000 |
419 summary: a |
418 summary: a |
420 |
419 |
421 $ hg status |
420 $ hg status |
422 M bar |
421 M bar |
423 ? b |
422 ? b |
|
423 $ cd .. |
|
424 |
|
425 stripping many nodes on a complex graph (issue3299) |
|
426 |
|
427 $ hg init issue3299 |
|
428 $ cd issue3299 |
|
429 $ hg debugbuilddag '@a.:a@b.:b.:x<a@a.:a<b@b.:b<a@a.:a' |
|
430 $ hg strip 'not ancestors(x)' |
|
431 saved backup bundle to $TESTTMP/issue3299/.hg/strip-backup/*-backup.hg (glob) |
|
432 |