view tests/test-parents.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
from hglib.util import b

class test_parents(common.basetest):
    def test_noparents(self):
        self.assertEquals(self.client.parents(), None)

    def test_basic(self):
        self.append('a', 'a')
        rev, node = self.client.commit(b('first'), addremove=True)
        self.assertEquals(node, self.client.parents()[0].node)
        self.assertEquals(node, self.client.parents(file=b('a'))[0].node)

    def test_two_parents(self):
        pass