Mercurial > public > mercurial-scm > python-hglib
view tests/test-bookmarks.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_bookmarks(common.basetest): def test_empty(self): self.assertEquals(self.client.bookmarks(), ([], -1)) def test_basic(self): self.append('a', 'a') rev0, node0 = self.client.commit(b('first'), addremove=True) self.append('a', 'a') rev1, node1 = self.client.commit(b('second')) self.client.bookmark(b('zero'), rev0) self.assertEquals(self.client.bookmarks(), ([(b('zero'), rev0, node0[:12])], -1)) self.client.bookmark(b('one'), rev1) self.assertEquals(self.client.bookmarks()[0], [(b('one'), rev1, node1[:12]), (b('zero'), rev0, node0[:12])]) #def test_spaces(self): # self.client.bookmark('s pace', self.rev0) # self.assertEquals(self.client.bookmarks(), # ([('s pace', 0, self.rev0.node[:12])], -1))