Mercurial > public > mercurial-scm > python-hglib

comparison tests/test_resolve.py @ 219:8341f2494b3f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hglib tests: migrate away from (unmaintained) nose
author Mathias De Mare <mathias.de_mare@nokia.com>
date Wed, 08 Mar 2023 17:04:58 +0100
parents tests/test-resolve.py@c1b966866ed7
children a2afbf236ca8
comparison
equal deleted inserted replaced
218:934608d4fcba 219:8341f2494b3f
1 from tests import common
2 import hglib
3 from hglib.util import b
4
5 class test_resolve(common.basetest):
6 def setUp(self):
7 common.basetest.setUp(self)
8
9 self.append('a', 'a')
10 self.append('b', 'b')
11 rev, self.node0 = self.client.commit(b('first'), addremove=True)
12
13 self.append('a', 'a')
14 self.append('b', 'b')
15 rev, self.node1 = self.client.commit(b('second'))
16
17 def test_basic(self):
18 self.client.update(self.node0)
19 self.append('a', 'b')
20 self.append('b', 'a')
21 rev, self.node3 = self.client.commit(b('third'))
22
23 self.assertRaises(hglib.error.CommandError, self.client.merge,
24 self.node1)
25 self.assertRaises(hglib.error.CommandError,
26 self.client.resolve, all=True)
27
28 self.assertEquals([(b('U'), b('a')), (b('U'), b('b'))],
29 self.client.resolve(listfiles=True))
30
31 self.client.resolve(b('a'), mark=True)
32 self.assertEquals([(b('R'), b('a')), (b('U'), b('b'))],
33 self.client.resolve(listfiles=True))