view tests/test-resolve.py @ 121:cc905ee18449

Added tag 1.2 for changeset 5d3783aebe5f

import common, hglib

class test_resolve(common.basetest):
    def setUp(self):
        common.basetest.setUp(self)

        self.append('a', 'a')
        self.append('b', 'b')
        rev, self.node0 = self.client.commit('first', addremove=True)

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

    def test_basic(self):
        self.client.update(self.node0)
        self.append('a', 'b')
        self.append('b', 'a')
        rev, self.node3 = self.client.commit('third')

        self.assertRaises(hglib.error.CommandError, self.client.merge, self.node1)
        self.assertRaises(hglib.error.CommandError, self.client.resolve, all=True)

        self.assertEquals([('U', 'a'), ('U', 'b')],
                          self.client.resolve(listfiles=True))

        self.client.resolve('a', mark=True)
        self.assertEquals([('R', 'a'), ('U', 'b')],
                          self.client.resolve(listfiles=True))