diff tests/test-resolve.py @ 63:939d1d763bb1

client: add resolve command

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-resolve.py	Fri Aug 19 22:52:59 2011 +0300
@@ -0,0 +1,29 @@
+import common, hglib
+
+class test_resolve(common.basetest):
+    def setUp(self):
+        common.basetest.setUp(self)
+
+        self.append('a', 'a')
+        self.append('b', 'b')
+        rev, self.node0 = self.client.commit('first', addremove=True)
+
+        self.append('a', 'a')
+        self.append('b', 'b')
+        rev, self.node1 = self.client.commit('second')
+
+    def test_basic(self):
+        self.client.update(self.node0)
+        self.append('a', 'b')
+        self.append('b', 'a')
+        rev, self.node3 = self.client.commit('third')
+
+        self.assertRaises(hglib.error.CommandError, self.client.merge, self.node1)
+        self.assertRaises(hglib.error.CommandError, self.client.resolve, all=True)
+
+        self.assertEquals([('U', 'a'), ('U', 'b')],
+                          self.client.resolve(listfiles=True))
+
+        self.client.resolve('a', mark=True)
+        self.assertEquals([('R', 'a'), ('U', 'b')],
+                          self.client.resolve(listfiles=True))