← 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: Patch Queue Manager
  • Date: 2011-09-22 14:12:18 UTC
  • mfrom: (6155.3.1 jam)
  • Revision ID: pqm@pqm.ubuntu.com-20110922141218-86s4uu6nqvourw4f
(jameinel) Cleanup comments bzrlib/smart/__init__.py (John A Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007, 2009, 2011 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
20
19
 
21
20
from bzrlib import check, osutils
22
 
from bzrlib.branch import Branch
23
 
from bzrlib.errors import PointlessCommit, BzrError
 
21
from bzrlib.errors import PointlessCommit
24
22
from bzrlib.tests import (
 
23
    TestCaseWithTransport,
 
24
    )
 
25
from bzrlib.tests.features import (
25
26
    SymlinkFeature,
26
 
    TestCaseWithTransport,
27
27
    )
28
 
from bzrlib.tests.test_revision import make_branches
29
28
 
30
29
 
31
30
class TestCommitMerge(TestCaseWithTransport):
92
91
 
93
92
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
94
93
        tree = by.repository.revision_tree('y@u-0-2')
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')
 
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')
98
96
 
99
97
        check.check_dwim(bx.base, False, True, True)
100
98
        check.check_dwim(by.base, False, True, True)