← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge.py

  • Committer: Daniel Watkins
  • Date: 2007-08-23 15:39:39 UTC
  • mto: (2778.4.1 odd_bloke)
  • mto: This revision was merged to the branch mainline in revision 2786.
  • Revision ID: d.m.watkins@warwick.ac.uk-20070823153939-hizvo3hib1xhmfjq
Minor reformatting per abentley's mailing list comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
36
36
    def example_branch(self, path='.'):
37
37
        tree = self.make_branch_and_tree(path)
38
38
        self.build_tree_contents([
39
 
            (pathjoin(path, 'hello'),   'foo'),
 
39
            (pathjoin(path, 'hello'), 'foo'),
40
40
            (pathjoin(path, 'goodbye'), 'baz')])
41
41
        tree.add('hello')
42
42
        tree.commit(message='setup')
102
102
    def test_merge_with_missing_file(self):
103
103
        """Merge handles missing file conflicts"""
104
104
        self.build_tree_contents([
105
 
            ('a/',                   ),
106
 
            ('a/sub/',               ),
 
105
            ('a/', ),
 
106
            ('a/sub/', ),
107
107
            ('a/sub/a.txt', 'hello\n'),
108
 
            ('a/b.txt',     'hello\n'),
 
108
            ('a/b.txt', 'hello\n'),
109
109
            ('a/sub/c.txt', 'hello\n')])
110
110
        a_tree = self.make_branch_and_tree('a')
111
111
        a_tree.add(['sub', 'b.txt', 'sub/c.txt', 'sub/a.txt'])
113
113
        b_tree = a_tree.bzrdir.sprout('b').open_workingtree()
114
114
        self.build_tree_contents([
115
115
            ('a/sub/a.txt', 'hello\nthere\n'),
116
 
            ('a/b.txt',     'hello\nthere\n'),
 
116
            ('a/b.txt', 'hello\nthere\n'),
117
117
            ('a/sub/c.txt', 'hello\nthere\n')])
118
118
        a_tree.commit(message='Added there')
119
119
        os.remove('a/sub/a.txt')
123
123
        a_tree.commit(message='Removed a.txt')
124
124
        self.build_tree_contents([
125
125
            ('b/sub/a.txt', 'hello\nsomething\n'),
126
 
            ('b/b.txt',     'hello\nsomething\n'),
 
126
            ('b/b.txt', 'hello\nsomething\n'),
127
127
            ('b/sub/c.txt', 'hello\nsomething\n')])
128
128
        b_tree.commit(message='Modified a.txt')
129
129
        os.chdir('b')