/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/selftest/test_commit_merge.py

  • Committer: Martin Pool
  • Date: 2005-09-20 09:06:51 UTC
  • Revision ID: mbp@sourcefrog.net-20050920090651-b71b6225a863ba91
- disallow selected-file commit of merges

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_commit_merge.py
78
78
        shutil.copyfile('x/ecks', 'y/ecks')
79
79
        by.add(['ecks'], ['ecks-id'])
80
80
        by.add_pending_merge('x@u-0-1')
 
81
 
 
82
        # partial commit of merges is currently not allowed, because
 
83
        # it would give different merge graphs for each file which
 
84
        # might be complex.  it can be allowed in the future.
 
85
        self.assertRaises(Exception,
 
86
                          commit,
 
87
                          by, 'partial commit', allow_pointless=False,
 
88
                          specific_files=['ecks'])
 
89
        
81
90
        commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
82
91
        tree = by.revision_tree('y@u-0-2')
83
92
        inv = tree.inventory
84
93
        self.assertEquals(inv['ecks-id'].text_version, 'x@u-0-1')
85
 
        self.assertEquals(inv['why-id'].text_version, 'y@u-0-1')
86
 
        
 
94
        self.assertEquals(inv['why-id'].text_version, 'y@u-0-1')        
87
95
 
88
96
 
89
97
if __name__ == '__main__':