Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add --no-all to hg evolve to reduce test changes
authorAnton Shestakov <av6@dwimlabs.net>
Wed, 24 Apr 2019 16:35:01 +0800
changeset 4578 75e76141cba2
parent 4577 bcd52ce0916d
child 4579 e6d7d261ca4a
tests: add --no-all to hg evolve to reduce test changes
tests/test-evolve-content-divergent-basic.t file | annotate | diff | comparison | revisions
tests/test-evolve-content-divergent-interrupted.t file | annotate | diff | comparison | revisions
tests/test-issue-6028.t file | annotate | diff | comparison | revisions
tests/test-stabilize-order.t file | annotate | diff | comparison | revisions 
--- a/tests/test-evolve-content-divergent-basic.t	Wed Apr 24 15:59:02 2019 +0200
+++ b/tests/test-evolve-content-divergent-basic.t	Wed Apr 24 16:35:01 2019 +0800
@@ -231,7 +231,7 @@
   o  0:8fa14d15e168 added hgignore
       () [default] draft
 
-  $ hg evolve --content-divergent --config ui.interactive=True<<EOF
+  $ hg evolve --content-divergent --no-all --config ui.interactive=True << EOF
   > c
   > EOF
   merge:[6] added d
@@ -288,7 +288,7 @@
   o  0:8fa14d15e168 added hgignore
       () [default] draft
 
-  $ hg evolve --content-divergent
+  $ hg evolve --content-divergent --no-all
   merge:[9] added a d with bar in it, expect some beers
   with: [8] added d
   base: [7] added d
@@ -337,7 +337,7 @@
   o  0:8fa14d15e168 added hgignore
       () [default] draft
 
-  $ hg evolve --content-divergent
+  $ hg evolve --content-divergent --no-all
   merge:[12] foo to d
   with: [11] foo to d
   base: [10] added a d with bar in it, expect some beers
@@ -397,7 +397,7 @@
   o  0:8fa14d15e168 added hgignore
       () [default] draft
 
-  $ hg evolve --content-divergent
+  $ hg evolve --content-divergent --no-all
   merge:[15] wat to d, wat?
   with: [14] bar to d, expect beers
   base: [13] foo to d
@@ -505,14 +505,14 @@
 
 Stabilize it
 
-  $ hg evolve -qn --confirm --content-divergent
+  $ hg evolve -qn --confirm --content-divergent --no-all
   merge:[3] More addition
   with: [2] More addition
   base: [1] More addition
   perform evolve? [Ny] n
   abort: evolve aborted by user
   [255]
-  $ echo y | hg evolve -qn --confirm --config ui.interactive=True --content-divergent
+  $ echo y | hg evolve -qn --confirm --config ui.interactive=True --content-divergent --no-all
   merge:[3] More addition
   with: [2] More addition
   base: [1] More addition
@@ -523,7 +523,7 @@
   hg up -C 867e43582046 &&
   hg revert --all --rev tip &&
   hg commit -m "`hg log -r 051337a45e7c --template={desc}`";
-  $ hg evolve -v --content-divergent
+  $ hg evolve -v --content-divergent --no-all
   merge:[3] More addition
   with: [2] More addition
   base: [1] More addition
@@ -601,14 +601,14 @@
   o  0:6569b5a81c7e@default(public) bk:[] root
   
 
-  $ hg evolve -qn --content-divergent
+  $ hg evolve -qn --content-divergent --no-all
   hg update -c 13c1b75640a1 &&
   hg merge 5bf84d1d71d1 &&
   hg commit -m "auto merge resolving conflict between 13c1b75640a1 and 5bf84d1d71d1"&&
   hg up -C 867e43582046 &&
   hg revert --all --rev tip &&
   hg commit -m "`hg log -r 13c1b75640a1 --template={desc}`";
-  $ hg evolve --content-divergent
+  $ hg evolve --content-divergent --no-all
   merge:[6] More addition (2)
   with: [4] More addition
   base: [1] More addition
--- a/tests/test-evolve-content-divergent-interrupted.t	Wed Apr 24 15:59:02 2019 +0200
+++ b/tests/test-evolve-content-divergent-interrupted.t	Wed Apr 24 16:35:01 2019 +0800
@@ -79,7 +79,7 @@
   o  0:8fa14d15e168 added hgignore
       () draft
 
-  $ hg evolve --content-divergent
+  $ hg evolve --content-divergent --no-all
   merge:[6] added d
   with: [5] added d
   base: [4] added d
@@ -447,7 +447,7 @@
   o  0:8fa14d15e168 added hgignore
       () draft
 
-  $ hg evolve --content-divergent
+  $ hg evolve --content-divergent --no-all
   merge:[6] added d
   with: [5] added d
   base: [4] added d
--- a/tests/test-issue-6028.t	Wed Apr 24 15:59:02 2019 +0200
+++ b/tests/test-issue-6028.t	Wed Apr 24 16:35:01 2019 +0800
@@ -112,7 +112,7 @@
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 start the evolve
-  $ hg evolve --update
+  $ hg evolve --update --no-all
   move:[8] merged aa
   atop:[4] merged b
   working directory is now at c920dd828523
--- a/tests/test-stabilize-order.t	Wed Apr 24 15:59:02 2019 +0200
+++ b/tests/test-stabilize-order.t	Wed Apr 24 16:35:01 2019 +0800
@@ -238,7 +238,7 @@
      date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     addroot
   
-  $ hg evolve
+  $ hg evolve --no-all
   abort: multiple evolve candidates
   (select one of *, * with --rev) (glob)
   [255]
evolve