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: run test with 3.6 and apply test change
authorPierre-Yves David <pierre-yves.david@fb.com>
Fri, 30 Oct 2015 15:48:13 +0000
changeset 1516 c4f8a2916e43
parent 1515 9729fdcc1fab
child 1517 a1f239a93c94
tests: run test with 3.6 and apply test change Tested with 3.4, 3.5 and 3.6. Some minor test update had to be done.
hgext/evolve.py file | annotate | diff | comparison | revisions
tests/test-evolve.t file | annotate | diff | comparison | revisions
tests/test-stabilize-conflict.t file | annotate | diff | comparison | revisions
tests/test-stabilize-result.t file | annotate | diff | comparison | revisions 
--- a/hgext/evolve.py	Fri Oct 30 16:04:37 2015 +0000
+++ b/hgext/evolve.py	Fri Oct 30 15:48:13 2015 +0000
@@ -20,7 +20,7 @@
 '''
 
 __version__ = '5.2.0'
-testedwith = '3.3.3 3.4.1'
+testedwith = '3.4.3 3.5.2 3.6'
 buglink = 'http://bz.selenic.com/'
 
 
--- a/tests/test-evolve.t	Fri Oct 30 16:04:37 2015 +0000
+++ b/tests/test-evolve.t	Fri Oct 30 15:48:13 2015 +0000
@@ -592,8 +592,7 @@
   $ hg graft -O 7
   grafting 7:a5bfd90a2f29 "conflict" (tip)
   merging 1
-  warning: conflicts during merge.
-  merging 1 incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging 1! (edit, then use 'hg resolve --mark')
   abort: unresolved conflicts, can't continue
   (use hg resolve and hg graft --continue)
   [255]
--- a/tests/test-stabilize-conflict.t	Fri Oct 30 16:04:37 2015 +0000
+++ b/tests/test-stabilize-conflict.t	Fri Oct 30 15:48:13 2015 +0000
@@ -127,8 +127,7 @@
   move:[5] babar count up to fifteen
   atop:[7] babar count up to ten
   merging babar
-  warning: conflicts during merge.
-  merging babar incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging babar! (edit, then use 'hg resolve --mark')
   evolve failed!
   fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
   abort: unresolved merge conflicts (see hg help resolve)
--- a/tests/test-stabilize-result.t	Fri Oct 30 16:04:37 2015 +0000
+++ b/tests/test-stabilize-result.t	Fri Oct 30 15:48:13 2015 +0000
@@ -82,8 +82,7 @@
   move:[5] newer a
   atop:[7] changea
   merging a
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   evolve failed!
   fix conflict and run "hg evolve --continue" or use "hg update -C" to abort
   abort: unresolved merge conflicts (see hg help resolve)
@@ -358,8 +357,7 @@
   with: [21] More addition
   base: [15] More addition
   merging a
-  warning: conflicts during merge.
-  merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
+  warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   abort: merge conflict between several amendments (this is not automated yet)
evolve