Mercurial > public > mercurial-scm > python-hglib

comparison tests/test-merge.py @ 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 c1b966866ed7
children
comparison
equal deleted inserted replaced
172:028f66e8e3ca 173:8c4d24b58c23
40 def test_merge_prompt_noninteractive(self): 40 def test_merge_prompt_noninteractive(self):
41 self.client.update(self.node0) 41 self.client.update(self.node0)
42 self.client.remove(b('a')) 42 self.client.remove(b('a'))
43 rev, node = self.client.commit(b('remove')) 43 rev, node = self.client.commit(b('remove'))
44 44
45 self.client.merge(cb=hglib.merge.handlers.noninteractive) 45 if self.client.version >= (3, 7):
46 self.assertRaises(hglib.error.CommandError,
47 self.client.merge,
48 cb=hglib.merge.handlers.noninteractive)
49 else:
50 self.client.merge(cb=hglib.merge.handlers.noninteractive)
46 51
47 diff = b("diff -r ") + node[:12] + b(""" a 52 diff = b("diff -r ") + node[:12] + b(""" a
48 --- /dev/null 53 --- /dev/null
49 +++ b/a 54 +++ b/a
50 @@ -0,0 +1,1 @@ 55 @@ -0,0 +1,1 @@