Mercurial > evolve
comparison tests/test-prune.t @ 6395:1328195f76a9 mercurial-5.6
test-compat: merge mercurial-5.7 into mercurial-5.6
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Mon, 06 Feb 2023 19:49:33 +0400 |
| parents | 171d13d8f0ce faea18a26188 |
| children |
comparison
equal
deleted
inserted
replaced
| 6349:3b486ae2e79a | 6395:1328195f76a9 |
|---|---|
| 34 | 34 |
| 35 Check arguments exclusive to each other | 35 Check arguments exclusive to each other |
| 36 --------------------------------------- | 36 --------------------------------------- |
| 37 | 37 |
| 38 $ hg prune --fold --pair | 38 $ hg prune --fold --pair |
| 39 abort: can only specify one of pair, fold | 39 abort: cannot specify both --pair and --fold |
| 40 [255] | 40 [255] |
| 41 $ hg prune --fold --biject | 41 $ hg prune --fold --biject |
| 42 abort: no revisions specified to prune | 42 abort: cannot specify both --biject and --fold |
| 43 [255] | 43 [255] |
| 44 $ hg prune --split --fold | 44 $ hg prune --split --fold |
| 45 abort: can only specify one of fold, split | 45 abort: cannot specify both --fold and --split |
| 46 [255] | 46 [255] |
| 47 $ hg prune --split --fold --pair | 47 $ hg prune --split --fold --pair |
| 48 abort: can only specify one of pair, fold, split | 48 abort: cannot specify both --pair and --fold |
| 49 [255] | 49 [255] |
| 50 $ hg prune --split --fold --biject | 50 $ hg prune --split --fold --biject |
| 51 abort: can only specify one of fold, split | 51 abort: cannot specify both --fold and --split |
| 52 [255] | 52 [255] |
| 53 | 53 |
| 54 Check simple case | 54 Check simple case |
| 55 ---------------------------- | 55 ---------------------------- |
| 56 | 56 |
| 199 | 199 |
| 200 | 200 |
| 201 two old, two new (should be denied) | 201 two old, two new (should be denied) |
| 202 | 202 |
| 203 $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nD")' -s 'desc("add nC")' | 203 $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nD")' -s 'desc("add nC")' |
| 204 abort: Can't use multiple successors for multiple precursors | 204 abort: cannot use multiple successors for multiple precursors |
| 205 (use --pair to mark a series as a replacement for another) | 205 (use --pair to mark a series as a replacement for another) |
| 206 [255] | 206 [255] |
| 207 $ hg debugobsolete | 207 $ hg debugobsolete |
| 208 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} | 208 9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'blah'} |
| 209 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} | 209 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '0', 'operation': 'prune', 'user': 'test'} |
| 486 1:5f6d8a4bf34a[] (obsolete/draft) added b | 486 1:5f6d8a4bf34a[] (obsolete/draft) added b |
| 487 working directory parent is obsolete! (5f6d8a4bf34a) | 487 working directory parent is obsolete! (5f6d8a4bf34a) |
| 488 (use 'hg evolve' to update to its parent successor) | 488 (use 'hg evolve' to update to its parent successor) |
| 489 | 489 |
| 490 $ cd .. | 490 $ cd .. |
| 491 | |
| 492 Test that pruning (without any successors) an already pruned | |
| 493 revision doesn't give false warning about divergence creation: | |
| 494 | |
| 495 $ hg init nofalsewarn | |
| 496 $ cd nofalsewarn | |
| 497 $ echo a > A | |
| 498 $ hg ci -Aqm "added a" | |
| 499 $ hg ci --amend -m "added A" | |
| 500 $ hg prune 0 --hidden | |
| 501 1 changesets pruned | |
| 502 | |
| 503 $ cd .. |