← 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: John Arbash Meinel
  • Date: 2010-02-16 16:08:40 UTC
  • mfrom: (4797.2.15 2.1)
  • mto: (4797.2.16 2.1)
  • mto: This revision was merged to the branch mainline in revision 5037.
  • Revision ID: john@arbash-meinel.com-20100216160840-xwbpuu0v89gq8lej
Tags: bzr-2.1.0
bring in the latest 2.1 changes

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 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
16
16
 
17
17
 
18
18
import os
 
19
import shutil
19
20
 
20
21
from bzrlib import check, osutils
21
 
from bzrlib.errors import PointlessCommit
 
22
from bzrlib.branch import Branch
 
23
from bzrlib.errors import PointlessCommit, BzrError
22
24
from bzrlib.tests import (
 
25
    SymlinkFeature,
23
26
    TestCaseWithTransport,
24
27
    )
25
 
from bzrlib.tests.features import (
26
 
    SymlinkFeature,
27
 
    )
 
28
from bzrlib.tests.test_revision import make_branches
28
29
 
29
30
 
30
31
class TestCommitMerge(TestCaseWithTransport):
91
92
 
92
93
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
93
94
        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')
 
95
        inv = tree.inventory
 
96
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
 
97
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
96
98
 
97
99
        check.check_dwim(bx.base, False, True, True)
98
100
        check.check_dwim(by.base, False, True, True)