Mercurial > evolve

changeset 4576:96ce1030d2fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add --update to hg evolve to reduce test changes for the next patch
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 14 Apr 2019 02:18:19 +0800
parents 903e8b983fac
children bcd52ce0916d
files tests/test-evolve-abort-orphan.t tests/test-evolve-content-divergent-corner-cases.t tests/test-evolve-continue.t tests/test-evolve-order.t tests/test-evolve-orphan-merge.t tests/test-evolve-orphan-split.t tests/test-evolve-phase-divergence.t tests/test-evolve-public-content-divergent-corner-cases.t tests/test-evolve-public-content-divergent-main.t tests/test-evolve-stop-orphan.t tests/test-evolve-topic.t tests/test-evolve.t tests/test-issue-6028.t tests/test-prev-next.t tests/test-rewind.t tests/test-split.t tests/test-stabilize-conflict.t tests/test-stabilize-order.t tests/test-tutorial.t tests/test-unstability-resolution-result.t tests/test-userguide.t
diffstat 21 files changed, 47 insertions(+), 44 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-evolve-abort-orphan.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-evolve-abort-orphan.t	Sun Apr 14 02:18:19 2019 +0800
@@ -127,7 +127,7 @@
 
 cleaning up things for next testing
 
-  $ hg evolve --all
+  $ hg evolve --all --update
   move:[4] added d
   atop:[5] added c
   merging d
--- a/tests/test-evolve-content-divergent-corner-cases.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-evolve-content-divergent-corner-cases.t	Sun Apr 14 02:18:19 2019 +0800
@@ -72,7 +72,7 @@
   o  0:9092f1db7931@default(draft) added a []
   
 
-  $ hg evolve --all --any --content-divergent
+  $ hg evolve --all --any --content-divergent --update
   merge:[2] divergent
   with: [3] divergent
   base: [1] added b
@@ -275,7 +275,7 @@
   o  0:9092f1db7931 added a
       () [default] draft
 
-  $ hg evolve --content-divergent --any
+  $ hg evolve --content-divergent --any --update
   merge:[5] updated e
   with: [6] updated e
   base: [4] added e
@@ -363,7 +363,7 @@
 
 Resolve the divergence, only "a" should be removed
 
-  $ hg evolve --content-divergent
+  $ hg evolve --content-divergent --update
   merge:[3] delete a
   with: [2] delete a
   base: [1] delete a
--- a/tests/test-evolve-continue.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-evolve-continue.t	Sun Apr 14 02:18:19 2019 +0800
@@ -113,7 +113,7 @@
   o  0:8fa14d15e168 added hgignore
       () draft
 
-  $ hg evolve
+  $ hg evolve --update
   move:[7] added e
   atop:[8] added d
   merging e
@@ -153,7 +153,7 @@
   $ hg amend
   3 new orphan changesets
 
-  $ hg evolve --all
+  $ hg evolve --all --update
   move:[2] added b
   atop:[9] added a
   merging b
@@ -236,7 +236,7 @@
   o  0:8fa14d15e168 added hgignore
       () draft
 
-  $ hg evolve --all
+  $ hg evolve --all --update
   move:[12] added d
   atop:[16] added c
   move:[13] added f
@@ -294,7 +294,7 @@
   $ hg amend
   2 new orphan changesets
 
-  $ hg evolve --all --confirm<<EOF
+  $ hg evolve --all --update --confirm << EOF
   > y
   > EOF
   move:[19] added g
@@ -310,7 +310,7 @@
   (no more unresolved files)
   continue: hg evolve --continue
 
-  $ hg evolve --continue<<EOF
+  $ hg evolve --continue << EOF
   > y
   > EOF
   evolving 19:981e615b14ca "added g"
--- a/tests/test-evolve-order.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-evolve-order.t	Sun Apr 14 02:18:19 2019 +0800
@@ -101,7 +101,7 @@
   |/
   o  0:f92638be10c7@default(public) add p
   
-  $ hg evolve --rev "orphan()"
+  $ hg evolve --rev "orphan()" --update
   move:[10] bprime
   atop:[11] asecond
   move:[6] add _c
@@ -207,7 +207,7 @@
   working directory is now at ea93190a9cd1
 
 Cleanup
-  $ hg evolve --rev "(desc(_d)::)"
+  $ hg evolve --rev "(desc(_d)::)" --update
   move:[17] add c3_
   atop:[28] add c2prime
   move:[18] add c4_
--- a/tests/test-evolve-orphan-merge.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-evolve-orphan-merge.t	Sun Apr 14 02:18:19 2019 +0800
@@ -65,7 +65,7 @@
   o  0:8fa14d15e168 added hgignore
       () draft
 
-  $ hg evolve --all
+  $ hg evolve --all --update
   move:[3] merging a and b
   atop:[4] added b
   working directory is now at 91fd62122a4b
@@ -110,7 +110,7 @@
   o  0:8fa14d15e168 added hgignore
       () draft
 
-  $ hg evolve --all
+  $ hg evolve --all --update
   move:[5] merging a and b
   atop:[6] added a
   working directory is now at 968d205ba4d8
@@ -214,7 +214,7 @@
   o  0:8fa14d15e168 added hgignore
       () draft
 
-  $ hg evolve --all
+  $ hg evolve --all --update
   move:[10] foobar to c
   atop:[11] foo to c
   merging c
@@ -269,7 +269,7 @@
   o  0:8fa14d15e168 added hgignore
       () draft
 
-  $ hg evolve --all
+  $ hg evolve --all --update
   move:[12] foobar to c
   atop:[13] foo to c
   merging c
@@ -346,7 +346,7 @@
   |/    () draft
   o  0:8fa14d15e168 added hgignore
       () draft
-  $ hg evolve --all
+  $ hg evolve --all --update
   move:[16] added m
   atop:[20] added l
   move:[19] merge commit
@@ -411,7 +411,7 @@
       () draft
 
 XXX: We should handle this case too
-  $ hg evolve --all
+  $ hg evolve --all --update
   move:[23] merged l and x
   atop:[25] added x
   move:[26] merged l and x
--- a/tests/test-evolve-orphan-split.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-evolve-orphan-split.t	Sun Apr 14 02:18:19 2019 +0800
@@ -74,7 +74,7 @@
   o  0:8fa14d15e168 added hgignore
       () draft
 
-  $ hg evolve
+  $ hg evolve --update
   move:[2] added c
   atop:[4] added a and b
   working directory is now at af13f0560b31
--- a/tests/test-evolve-phase-divergence.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-evolve-phase-divergence.t	Sun Apr 14 02:18:19 2019 +0800
@@ -199,7 +199,7 @@
 XXX: evolve should have mentioned that draft commit is just obsoleted in favour
 of public one. From the message it looks like a new commit is created.
 
-  $ hg evolve --phase-divergent
+  $ hg evolve --phase-divergent --update
   recreate:[2] tweak a
   atop:[1] modify a
   no changes to commit
@@ -315,7 +315,7 @@
 XXX: we should document what should user expect where running this, writing this
 test I have to go through code base to understand what will be the behavior
 
-  $ hg evolve --phase-divergent
+  $ hg evolve --phase-divergent --update
   recreate:[4] added bar to foo
   atop:[3] added foo to foo
   committed as 3d62500c673d
@@ -468,7 +468,7 @@
 Resolving the new phase-divergence changeset using `hg evolve`
 ---------------------------------------------------------------
 
-  $ hg evolve --phase-divergent
+  $ hg evolve --phase-divergent --update
   recreate:[7] foo to bar
   atop:[6] added bar to bar
   committed as 502e73736632
@@ -604,7 +604,7 @@
 Using `hg evolve` to resolve phase-divergence
 ---------------------------------------------
 
-  $ hg evolve --phase-divergent
+  $ hg evolve --phase-divergent --update
   recreate:[10] added x to x
   atop:[9] added x to x
   rebasing to destination parent: 502e73736632
@@ -725,7 +725,7 @@
 Resolving divergence using `hg evolve`
 -------------------------------------
 
-  $ hg evolve --phase-divergent
+  $ hg evolve --phase-divergent --update
   recreate:[14] y to y and foobar to foo
   atop:[12] y to y and foobar to foo
   rebasing to destination parent: 2352021b3785
@@ -801,7 +801,7 @@
 Resolution using `hg evolve --phase-divergent`
 ----------------------------------------------
 
-  $ hg evolve --phase-divergent
+  $ hg evolve --phase-divergent --update
   recreate:[19] added l to l
   atop:[17] added l to l
   rebasing to destination parent: 8c2bb6fb44e9
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Sun Apr 14 02:18:19 2019 +0800
@@ -384,7 +384,7 @@
          (No patch available, changesets rebased)
   
 
-  $ hg evolve --content-divergent --any
+  $ hg evolve --content-divergent --any --update
   merge:[5] added d
   with: [4] added c e
   base: [3] added d
--- a/tests/test-evolve-public-content-divergent-main.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-evolve-public-content-divergent-main.t	Sun Apr 14 02:18:19 2019 +0800
@@ -355,7 +355,7 @@
   o  0:9092f1db7931 added a
       public
   
-  $ hg evolve --content-divergent --any
+  $ hg evolve --content-divergent --any --update
   merge:[5] added d
   with: [4] added d c e
   base: [3] added d
--- a/tests/test-evolve-stop-orphan.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-evolve-stop-orphan.t	Sun Apr 14 02:18:19 2019 +0800
@@ -191,7 +191,7 @@
 we do `evolve --stop`
 --------------------------------------------------------------------------------
 
-  $ hg evolve
+  $ hg evolve --update
   move:[4] added d
   atop:[5] added c
   merging d
--- a/tests/test-evolve-topic.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-evolve-topic.t	Sun Apr 14 02:18:19 2019 +0800
@@ -132,7 +132,7 @@
   s1: add ccc
   s0^ add bbb (base)
 
-  $ hg evolve --all
+  $ hg evolve --all --update
   move:[s3] add eee
   atop:[s2] add ddd
   move:[s4] add fff
@@ -168,7 +168,7 @@
 Test that evolve does not loose topic information
 -------------------------------------------------
 
-  $ hg evolve --rev 'topic(bar)'
+  $ hg evolve --rev 'topic(bar)' --update
   move:[6] add ggg
   atop:[13] add fff
   move:[7] add hhh
--- a/tests/test-evolve.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-evolve.t	Sun Apr 14 02:18:19 2019 +0800
@@ -1406,7 +1406,7 @@
   o  16:0cf3707e8971@default(draft) a3
   |
   ~
-  $ hg evolve --rev "0cf3707e8971::"
+  $ hg evolve --rev "0cf3707e8971::" --update
   move:[30] add uu
   atop:[32] _pp
   working directory is now at be23044af550
--- a/tests/test-issue-6028.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-issue-6028.t	Sun Apr 14 02:18:19 2019 +0800
@@ -112,7 +112,7 @@
   2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 
 start the evolve
-  $ hg evolve
+  $ hg evolve --update
   move:[8] merged aa
   atop:[4] merged b
   working directory is now at c920dd828523
--- a/tests/test-prev-next.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-prev-next.t	Sun Apr 14 02:18:19 2019 +0800
@@ -259,7 +259,7 @@
   o  0:a154386e50d1 added a
   
 
-  $ hg evolve -r 5
+  $ hg evolve -r 5 --update
   move:[5] added d
   atop:[6] added b (3)
   working directory is now at 47ea25be8aea
--- a/tests/test-rewind.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-rewind.t	Sun Apr 14 02:18:19 2019 +0800
@@ -661,7 +661,7 @@
   $ echo AA >> A
   $ hg amend -m 'c_A1'
   1 new orphan changesets
-  $ hg evolve --all
+  $ hg evolve --all --update
   move:[2] c_B0
   atop:[3] c_A1
   working directory is now at a65fceb2324a
--- a/tests/test-split.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-split.t	Sun Apr 14 02:18:19 2019 +0800
@@ -151,7 +151,7 @@
   $ echo "change to b" >> _b
   $ hg amend -m "_cprim"
   2 new orphan changesets
-  $ hg evolve --all
+  $ hg evolve --all --update
   move:[5] split1
   atop:[7] _cprim
   move:[6] split2
@@ -218,7 +218,7 @@
   2d8abdb827cdf71ca477ef6985d7ceb257c53c1b e2b4afde39803bd42bb1374b230fca1b1e8cc868 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
   033b3f5ae73db67c10de938fb6f26b949aaef172 bb5e4f6020c74e7961a51fda635ea9df9b04dda8 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '4', 'operation': 'evolve', 'user': 'test'}
   b434287e665ce757ee5463a965cb3d119ca9e893 ead2066d1dbf14833fe1069df1b735e4e9468c40 1188c4216eba37f18a1de6558564601d00ff2143 0 (Thu Jan 01 00:00:00 1970 +0000) {'ef1': '13', 'operation': 'split', 'user': 'test'}
-  $ hg evolve --all
+  $ hg evolve --all --update
   move:[8] split1
   atop:[11] split4
   move:[9] split2
--- a/tests/test-stabilize-conflict.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-stabilize-conflict.t	Sun Apr 14 02:18:19 2019 +0800
@@ -77,7 +77,7 @@
    dix
   $ hg amend
   1 new orphan changesets
-  $ hg evolve
+  $ hg evolve --update
   move:[2] babar count up to fifteen
   atop:[3] babar count up to ten
   merging babar
@@ -123,7 +123,7 @@
   +ten
   $ hg amend
   1 new orphan changesets
-  $ hg evolve
+  $ hg evolve --update
   move:[4] babar count up to fifteen
   atop:[5] babar count up to ten
   merging babar
--- a/tests/test-stabilize-order.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-stabilize-order.t	Sun Apr 14 02:18:19 2019 +0800
@@ -92,7 +92,7 @@
   $ hg up -r 005fe5914f78
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg debugobsolete > successors.old
-  $ hg evolve -v
+  $ hg evolve -v --update
   move:[3] addc
   atop:[6] addb
   hg rebase -r 7a7552255fb5 -d 81b8bbcd5892
--- a/tests/test-tutorial.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-tutorial.t	Sun Apr 14 02:18:19 2019 +0800
@@ -1830,7 +1830,10 @@
       }
 #endif
 
-  $ hg evolve
+The --update flag of `hg evolve` automatically updates to the tipmost evolved
+changeset.
+
+  $ hg evolve --update
   move:[15] SPAM SPAM SPAM
   atop:[12] bathroom stuff
   merging shopping
--- a/tests/test-unstability-resolution-result.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-unstability-resolution-result.t	Sun Apr 14 02:18:19 2019 +0800
@@ -85,7 +85,7 @@
   $ echo 'a' > a
   $ hg amend
   1 new orphan changesets
-  $ hg evolve
+  $ hg evolve --update
   move:[4] newer a
   atop:[5] changea
   merging a
--- a/tests/test-userguide.t	Wed Apr 24 15:57:49 2019 +0200
+++ b/tests/test-userguide.t	Sun Apr 14 02:18:19 2019 +0800
@@ -179,7 +179,7 @@
   o  9:171c6a79a27b  draft  fix bug 64
   |
   ~
-  $ hg evolve -q --all
+  $ hg evolve -q --all --update
   $ hg shortlog -G -r 171c6a79a27b::
   @  15:91b4b0f8b5c5  draft  feature 23
   |
@@ -219,7 +219,7 @@
   x  17:b23d06b457a8  draft  debug hack
   |
   ~
-  $ hg evolve -q --all --any
+  $ hg evolve -q --all --any --update
   $ hg --hidden shortlog -G -r 1f33e68b18b9::
   @  19:4393e5877437  draft  more work
   |
@@ -253,7 +253,7 @@
   $ hg status
   M file2.c
   $ hg revert file2.c
-  $ hg evolve --all --any
+  $ hg evolve --all --any --update
   move:[21] fix bug 67
   atop:[22] fix bug 53
   working directory is now at 0d972d6888e6
@@ -305,7 +305,7 @@
   o  23:0d972d6888e6  draft  fix bug 67
   |
   ~
-  $ hg evolve --all --any
+  $ hg evolve --all --any --update
   move:[25] new feature
   atop:[26] fix a bug
   working directory is now at 166c1c368ab6