view tests/test-pull.py @ 85:bfd1c264f6cb

Added signature for changeset c41442cb355d

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())