--- a/tests/test-update-branches.t Fri Dec 03 12:19:36 2021 +0100
+++ b/tests/test-update-branches.t Fri Dec 03 12:03:23 2021 +0100
@@ -226,6 +226,11 @@
parent=2
M foo
+ $ revtest '--merge none dirty linear' dirty 1 2 --no-check
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ parent=2
+ M foo
+
$ revtest 'none dirty linear' dirty 1 2 --clean
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=2
@@ -247,6 +252,11 @@
parent=1
M foo
+ $ revtest 'none dirty linear' dirty 1 2 --no-merge
+ abort: uncommitted changes
+ parent=1
+ M foo
+
$ revtest 'none dirty linear' dirty 1 2 --clean
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=2