← 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: Robert Collins
  • Date: 2005-09-27 07:24:40 UTC
  • mfrom: (1185.1.41)
  • Revision ID: robertc@robertcollins.net-20050927072440-1bf4d99c3e1db5b3
pair programming worx... merge integration and weave

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_commit_merge.py
38
38
        """Simple commit of two-way merge of empty trees."""
39
39
        os.mkdir('x')
40
40
        os.mkdir('y')
41
 
        bx = Branch('x', init=True)
42
 
        by = Branch('y', init=True)
 
41
        bx = Branch.initialize('x')
 
42
        by = Branch.initialize('y')
43
43
 
44
44
        commit(bx, 'commit one', rev_id='x@u-0-1', allow_pointless=True)
45
45
        commit(by, 'commit two', rev_id='y@u-0-1', allow_pointless=True)
66
66
        """Commit merge of two trees with no overlapping files."""
67
67
        self.build_tree(['x/', 'x/ecks', 'y/', 'y/why'])
68
68
 
69
 
        bx = Branch('x', init=True)
70
 
        by = Branch('y', init=True)
 
69
        bx = Branch.initialize('x')
 
70
        by = Branch.initialize('y')
71
71
        bx.add(['ecks'], ['ecks-id'])
72
72
        by.add(['why'], ['why-id'])
73
73
 
96
96
 
97
97
        check(bx)
98
98
        check(by)
99
 
 
100
 
 
101
 
if __name__ == '__main__':
102
 
    import unittest
103
 
    unittest.main()
104