--- a/tests/test-update-branches.t Fri Feb 18 12:55:39 2022 +0100
+++ b/tests/test-update-branches.t Fri Feb 18 14:27:43 2022 +0100
@@ -158,47 +158,47 @@
parent=3
M sub/suba
- $ revtest '-C dirty linear' dirty 1 2 -C
+ $ revtest '--clean dirty linear' dirty 1 2 --clean
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=2
- $ revtest '-c dirty linear' dirty 1 2 -c
+ $ revtest '--check dirty linear' dirty 1 2 --check
abort: uncommitted changes
parent=1
M foo
- $ revtest '-m dirty linear' dirty 1 2 -m
+ $ revtest '--merge dirty linear' dirty 1 2 --merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=2
M foo
- $ revtest '-m dirty cross' dirty 3 4 -m
+ $ revtest '--merge dirty cross' dirty 3 4 --merge
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
parent=4
M foo
- $ revtest '-c dirtysub linear' dirtysub 1 2 -c
+ $ revtest '--check dirtysub linear' dirtysub 1 2 --check
abort: uncommitted changes in subrepository "sub"
parent=1
M sub/suba
- $ norevtest '-c clean same' clean 2 -c
+ $ norevtest '--check clean same' clean 2 -c
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
updated to "bd10386d478c: 2"
1 other heads for branch "default"
parent=2
- $ revtest '-cC dirty linear' dirty 1 2 -cC
+ $ revtest '--check --clean dirty linear' dirty 1 2 "--check --clean"
abort: cannot specify both --clean and --check
parent=1
M foo
- $ revtest '-mc dirty linear' dirty 1 2 -mc
+ $ revtest '--merge -checkc dirty linear' dirty 1 2 "--merge --check"
abort: cannot specify both --check and --merge
parent=1
M foo
- $ revtest '-mC dirty linear' dirty 1 2 -mC
+ $ revtest '--merge -clean dirty linear' dirty 1 2 "--merge --clean"
abort: cannot specify both --clean and --merge
parent=1
M foo
@@ -211,12 +211,27 @@
parent=1
M foo
- $ revtest 'none dirty linear' dirty 1 2 -c
+ $ revtest 'none dirty linear' dirty 1 2 --check
+ abort: uncommitted changes
+ parent=1
+ M foo
+
+ $ revtest '--merge none dirty linear' dirty 1 2 --check
abort: uncommitted changes
parent=1
M foo
- $ revtest 'none dirty linear' dirty 1 2 -C
+ $ revtest '--merge none dirty linear' dirty 1 2 --merge
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+ 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
@@ -232,12 +247,17 @@
parent=2
M foo
- $ revtest 'none dirty linear' dirty 1 2 -c
+ $ revtest 'none dirty linear' dirty 1 2 --check
abort: uncommitted changes
parent=1
M foo
- $ revtest 'none dirty linear' dirty 1 2 -C
+ $ 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
@@ -272,14 +292,14 @@
# To mark files as resolved: hg resolve --mark FILE
$ cat a
- <<<<<<< working copy: 6efa171f091b - test: 3
+ <<<<<<< working copy: 6efa171f091b - test: 3
three
dirty
- ||||||| base
+ ||||||| working copy parent: 6efa171f091b - test: 3
three
=======
four
- >>>>>>> destination: d047485b3896 b1 - test: 4
+ >>>>>>> destination: d047485b3896 b1 - test: 4
$ rm a.orig
$ echo 'update.check = noconflict' >> .hg/hgrc
@@ -676,9 +696,8 @@
(commit or update --clean to discard changes)
[255]
-Test that we don't crash when updating from a pruned changeset (i.e. has no
-successors). Behavior should probably be that we update to the first
-non-obsolete parent but that will be decided later.
+Test that we update to the closest non-obsolete ancestor when updating from a
+pruned changeset (i.e. that has no successors)
$ hg id --debug -r 2
bd10386d478cd5a9faf2e604114c8e6da62d3889
$ hg up --quiet 0
@@ -686,21 +705,18 @@
$ hg debugobsolete bd10386d478cd5a9faf2e604114c8e6da62d3889
1 new obsolescence markers
obsoleted 1 changesets
+ $ hg log -r '_destupdate()'
+ 1:0786582aa4b1 1 (no-eol)
$ hg up
- 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-
-Test experimental revset support
-
- $ hg log -r '_destupdate()'
- 2:bd10386d478c 2 (no-eol)
+ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Test that boolean flags allow --no-flag specification to override [defaults]
$ cat >> $HGRCPATH <<EOF
> [defaults]
> update = --check
> EOF
- $ hg co 2
+ $ hg co 1
abort: uncommitted changes
[20]
- $ hg co --no-check 2
+ $ hg co --no-check 1
0 files updated, 0 files merged, 0 files removed, 0 files unresolved