--- a/tests/test-prune.t Tue Aug 28 11:25:32 2018 +0200
+++ b/tests/test-prune.t Mon Sep 03 22:09:26 2018 +0200
@@ -35,14 +35,20 @@
Check arguments exclusive to each other
---------------------------------------
+ $ hg prune --fold --pair
+ abort: can only specify one of pair, fold
+ [255]
$ hg prune --fold --biject
- abort: can only specify one of biject, fold
+ abort: nothing to prune
[255]
$ hg prune --split --fold
abort: can only specify one of fold, split
[255]
+ $ hg prune --split --fold --pair
+ abort: can only specify one of pair, fold, split
+ [255]
$ hg prune --split --fold --biject
- abort: can only specify one of biject, fold, split
+ abort: can only specify one of fold, split
[255]
Check simple case
@@ -196,7 +202,7 @@
$ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nD")' -s 'desc("add nC")'
abort: Can't use multiple successors for multiple precursors
- (use --biject to mark a series as a replacement for another)
+ (use --pair to mark a series as a replacement for another)
[255]
$ hg debugobsolete
9d206ffc875e1bc304590549be293be36821e66c 0 {47d2a3944de8b013de3be9578e8e344ea2e6c097} (Sat Dec 15 00:00:00 1979 +0000) {'ef1': '0', 'user': 'blah'}
@@ -223,7 +229,7 @@
814c38b95e72dfe2cbf675b1649ea9d780c89a80 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '9', 'user': 'test'}
354011cd103f58bbbd9091a3cee6d6a6bd0dddf7 6f6f25e4f748d8f7571777e6e168aedf50350ce8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'user': 'test'}
-two old, two new with --biject
+two old, two new with --pair
$ hg up 0
0 files updated, 0 files merged, 4 files removed, 0 files unresolved
@@ -231,7 +237,7 @@
created new head
$ mkcommit n2
- $ hg prune 'desc("add n1")::desc("add n2")' -s 'desc("add nD")::desc("add nE")' --biject
+ $ hg prune 'desc("add n1")::desc("add n2")' -s 'desc("add nD")::desc("add nE")' --pair
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
working directory now at 1f0dee641bb7
2 changesets pruned