← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_commit_merge.py

  • Committer: Martin Pool
  • Date: 2005-09-20 09:03:19 UTC
  • Revision ID: mbp@sourcefrog.net-20050920090319-a5ef624ab934d72d
- fix up test for merge of trees

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_commit_merge.py
16
16
 
17
17
 
18
18
import os
 
19
import shutil
19
20
 
20
21
from bzrlib.selftest import TestCaseInTempDir
21
22
from bzrlib.branch import Branch
74
75
 
75
76
        fetch(from_branch=bx, to_branch=by)
76
77
        # we haven't merged the texts, but let's fake it
77
 
        self.build_tree(['y/ecks'])
 
78
        shutil.copyfile('x/ecks', 'y/ecks')
78
79
        by.add(['ecks'], ['ecks-id'])
79
80
        by.add_pending_merge('x@u-0-1')
80
81
        commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
81
82
        tree = by.revision_tree('y@u-0-2')
82
83
        inv = tree.inventory
83
 
        ## self.assertEquals(inv['ecks-id'].text_version, 'x@u-0-1')
84
 
        ## self.assertEquals(inv['why-id'].text_version, 'y@u-0-1')
 
84
        self.assertEquals(inv['ecks-id'].text_version, 'x@u-0-1')
 
85
        self.assertEquals(inv['why-id'].text_version, 'y@u-0-1')
85
86
        
86
87
 
87
88