Mercurial > evolve

diff tests/test-evolve-public-content-divergent-corner-cases.t @ 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 d081cc4f5fef
children 4fcf9a71befc
line wrap: on
line diff
--- 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