Mercurial > python-hglib

changeset 173:8c4d24b58c23 2.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: adjust test-merge for mercurial 3.7 As of changeset 88d5db4b155c, the noninteractive handler for merge leaves conflicting files unresolved.
author Julien Cristau <julien.cristau@logilab.fr>
date Fri, 19 Feb 2016 19:16:30 +0100
parents 028f66e8e3ca
children c67410c74723
files tests/test-merge.py
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-merge.py	Mon Feb 01 18:16:24 2016 -0600
+++ b/tests/test-merge.py	Fri Feb 19 19:16:30 2016 +0100
@@ -42,7 +42,12 @@
         self.client.remove(b('a'))
         rev, node = self.client.commit(b('remove'))
 
-        self.client.merge(cb=hglib.merge.handlers.noninteractive)
+        if self.client.version >= (3, 7):
+            self.assertRaises(hglib.error.CommandError,
+                self.client.merge,
+                cb=hglib.merge.handlers.noninteractive)
+        else:
+            self.client.merge(cb=hglib.merge.handlers.noninteractive)
 
         diff = b("diff -r ") + node[:12] + b(""" a
 --- /dev/null