← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
1
 
# Copyright (C) 2005, 2006, 2007, 2009, 2011 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2010, 2011, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
 
18
18
import os
19
19
 
20
 
from bzrlib import check, osutils
 
20
from bzrlib import (
 
21
    check,
 
22
    osutils,
 
23
    )
21
24
from bzrlib.errors import PointlessCommit
22
25
from bzrlib.tests import (
23
26
    TestCaseWithTransport,
25
28
from bzrlib.tests.features import (
26
29
    SymlinkFeature,
27
30
    )
 
31
from bzrlib.tests.matchers import RevisionHistoryMatches
28
32
 
29
33
 
30
34
class TestCommitMerge(TestCaseWithTransport):
54
58
        wty.merge_from_branch(bx)
55
59
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
56
60
 
57
 
        self.assertEquals(by.revno(), 3)
58
 
        self.assertEquals(list(by.revision_history()),
59
 
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
 
61
        self.assertEqual(by.revno(), 3)
 
62
        graph = wty.branch.repository.get_graph()
 
63
        self.addCleanup(wty.lock_read().unlock)
 
64
        self.assertThat(by,
 
65
            RevisionHistoryMatches([base_rev, 'y@u-0-1', 'y@u-0-2'])
 
66
            )
60
67
        rev = by.repository.get_revision('y@u-0-2')
61
 
        self.assertEquals(rev.parent_ids,
 
68
        self.assertEqual(rev.parent_ids,
62
69
                          ['y@u-0-1', 'x@u-0-1'])
63
70
 
64
71
    def test_merge_new_file(self):
91
98
 
92
99
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
93
100
        tree = by.repository.revision_tree('y@u-0-2')
94
 
        self.assertEquals(tree.get_file_revision('ecks-id'), 'x@u-0-1')
95
 
        self.assertEquals(tree.get_file_revision('why-id'), 'y@u-0-1')
 
101
        self.assertEqual(tree.get_file_revision('ecks-id'), 'x@u-0-1')
 
102
        self.assertEqual(tree.get_file_revision('why-id'), 'y@u-0-1')
96
103
 
97
104
        check.check_dwim(bx.base, False, True, True)
98
105
        check.check_dwim(by.base, False, True, True)