Mercurial > public > mercurial-scm > python-hglib
view tests/test-pull.py @ 166:bfdc96f22321
Added tag 1.8 for changeset dbb21a4c0eb9
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 01 Sep 2015 17:03:10 -0500 |
parents | c1b966866ed7 |
children |
line wrap: on
line source
from tests import common import hglib from hglib.util import b class test_pull(common.basetest): def test_basic(self): self.append('a', 'a') self.client.commit(b('first'), addremove=True) self.client.clone(dest=b('other')) other = hglib.open(b('other')) self.append('a', 'a') self.client.commit(b('second')) self.assertTrue(other.pull()) self.assertEquals(self.client.log(), other.log()) def test_unresolved(self): self.append('a', 'a') self.client.commit(b('first'), addremove=True) self.client.clone(dest=b('other')) other = hglib.open(b('other')) self.append('a', 'a') self.client.commit(b('second')) self.append('other/a', 'b') self.assertFalse(other.pull(update=True)) self.assertTrue((b('M'), b('a')) in other.status())