diff tests/test-pull.py @ 40:238efe4fd7db

client: add pull command

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/tests/test-pull.py	Mon Aug 15 22:46:45 2011 +0300
@@ -0,0 +1,29 @@
+import common, hglib
+
+class test_pull(common.basetest):
+    def test_basic(self):
+        self.append('a', 'a')
+        self.client.commit('first', addremove=True)
+
+        self.client.clone(dest='other')
+        other = hglib.open('other')
+
+        self.append('a', 'a')
+        self.client.commit('second')
+
+        self.assertTrue(other.pull())
+        self.assertEquals(self.client.log(), other.log())
+
+    def test_unresolved(self):
+        self.append('a', 'a')
+        self.client.commit('first', addremove=True)
+
+        self.client.clone(dest='other')
+        other = hglib.open('other')
+
+        self.append('a', 'a')
+        self.client.commit('second')
+
+        self.append('other/a', 'b')
+        self.assertFalse(other.pull(update=True))
+        self.assertTrue(('M', 'a') in other.status())