view tests/test-push.py @ 173:8c4d24b58c23 2.1

tests: adjust test-merge for mercurial 3.7 As of changeset 88d5db4b155c, the noninteractive handler for merge leaves conflicting files unresolved.
author Julien Cristau <julien.cristau@logilab.fr>
date Fri, 19 Feb 2016 19:16:30 +0100
parents c1b966866ed7
children
line wrap: on
line source

from tests import common
import hglib
from hglib.util import b

class test_push(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'))

        # broken in hg, doesn't return 1 if nothing to push
        #self.assertFalse(self.client.push('other'))

        self.append('a', 'a')
        self.client.commit(b('second'))

        self.assertTrue(self.client.push(b('other')))
        self.assertEquals(self.client.log(), other.log())