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.
test-compat: reverte output change from 4764e8436b2a (hg-5.1) mercurial-5.0
authorPierre-Yves David <pierre-yves.david@octobus.net>
Mon, 29 Jul 2019 13:19:54 +0200
branchmercurial-5.0
changeset 4778 1340d6718a88
parent 4777 ff452675566c
child 4779 85a97f37c78f
test-compat: reverte output change from 4764e8436b2a (hg-5.1) These change where applied in evolve's changeset 88c8ef4d703c.
tests/test-evolve-public-content-divergent-corner-cases.t file | annotate | diff | comparison | revisions
tests/test-prev-next.t file | annotate | diff | comparison | revisions 
--- a/tests/test-evolve-public-content-divergent-corner-cases.t	Mon Jul 29 13:19:48 2019 +0200
+++ b/tests/test-evolve-public-content-divergent-corner-cases.t	Mon Jul 29 13:19:54 2019 +0200
@@ -417,8 +417,8 @@
   $ hg evolve --continue
   evolving 4:e568fd1029bb "added c e"
   file 'd' was deleted in other but was modified in local.
-  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
-  What do you want to do? u
+  What do you want to do?
+  use (c)hanged version, (d)elete, or leave (u)nresolved? u
   1 files updated, 0 files merged, 0 files removed, 1 files unresolved
   unresolved merge conflicts
   (see 'hg help evolve.interrupted')
--- a/tests/test-prev-next.t	Mon Jul 29 13:19:48 2019 +0200
+++ b/tests/test-prev-next.t	Mon Jul 29 13:19:54 2019 +0200
@@ -470,8 +470,8 @@
   [255]
   $ hg prev --merge --config commands.update.check=abort
   file 'bar' was deleted in other [destination] but was modified in local [working copy].
-  You can use (c)hanged version, (d)elete, or leave (u)nresolved.
-  What do you want to do? 
+  What do you want to do?
+  use (c)hanged version, (d)elete, or leave (u)nresolved? 
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
   [1] added foo
evolve