← 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: Martin Pool
  • Date: 2007-06-26 10:12:33 UTC
  • mto: This revision was merged to the branch mainline in revision 2555.
  • Revision ID: mbp@sourcefrog.net-20070626101233-hrmvl09320gt6b8m
Deprecate run_bzr_captured in favour of just  run_bzr

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
57
57
        self.run_bzr('branch a b')
58
58
        os.chdir('b')
59
59
        file('goodbye', 'wt').write('quux')
60
 
        self.run_bzr_captured(['commit',  '-m',  "more u's are always good"])
 
60
        self.run_bzr(['commit',  '-m',  "more u's are always good"])
61
61
 
62
62
        os.chdir('../a')
63
63
        file('hello', 'wt').write('quuux')
106
106
        print >> file('sub/c.txt', 'wb'), "hello"
107
107
        self.run_bzr('init')
108
108
        self.run_bzr('add')
109
 
        self.run_bzr_captured(['commit', '-m', 'added a'])
 
109
        self.run_bzr(['commit', '-m', 'added a'])
110
110
        self.run_bzr('branch . ../b')
111
111
        print >> file('sub/a.txt', 'ab'), "there"
112
112
        print >> file('b.txt', 'ab'), "there"
113
113
        print >> file('sub/c.txt', 'ab'), "there"
114
 
        self.run_bzr_captured(['commit', '-m', 'Added there'])
 
114
        self.run_bzr(['commit', '-m', 'Added there'])
115
115
        os.unlink('sub/a.txt')
116
116
        os.unlink('sub/c.txt')
117
117
        os.rmdir('sub')
118
118
        os.unlink('b.txt')
119
 
        self.run_bzr_captured(['commit', '-m', 'Removed a.txt'])
 
119
        self.run_bzr(['commit', '-m', 'Removed a.txt'])
120
120
        os.chdir('../b')
121
121
        print >> file('sub/a.txt', 'ab'), "something"
122
122
        print >> file('b.txt', 'ab'), "something"
123
123
        print >> file('sub/c.txt', 'ab'), "something"
124
 
        self.run_bzr_captured(['commit', '-m', 'Modified a.txt'])
 
124
        self.run_bzr(['commit', '-m', 'Modified a.txt'])
125
125
        self.run_bzr('merge ../a/', retcode=1)
126
126
        self.assert_(os.path.exists('sub/a.txt.THIS'))
127
127
        self.assert_(os.path.exists('sub/a.txt.BASE'))
249
249
        self.run_bzr('branch a b')
250
250
        os.chdir('b')
251
251
        file('goodbye', 'wt').write('quux')
252
 
        self.run_bzr_captured(['commit', '-m', "mode u's are always good"])
 
252
        self.run_bzr(['commit', '-m', "mode u's are always good"])
253
253
        os.chdir('../a')
254
254
 
255
255
    def pullable_branch(self):