← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

  • Committer: Aaron Bentley
  • Date: 2005-09-30 03:59:46 UTC
  • mto: (1393.1.21) (1185.14.1)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: aaron.bentley@utoronto.ca-20050930035945-febfb28a4c499be4
Handled modified files missing from THIS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
265
265
        os.chdir('a')
266
266
        os.mkdir('sub')
267
267
        print >> file('sub/a.txt', 'wb'), "hello"
 
268
        print >> file('b.txt', 'wb'), "hello"
 
269
        print >> file('sub/c.txt', 'wb'), "hello"
268
270
        self.runbzr('init')
269
271
        self.runbzr('add')
270
272
        self.runbzr(('commit', '-m', 'added a'))
271
273
        self.runbzr('branch . ../b')
272
274
        print >> file('sub/a.txt', 'ab'), "there"
 
275
        print >> file('b.txt', 'ab'), "there"
 
276
        print >> file('sub/c.txt', 'ab'), "there"
273
277
        self.runbzr(('commit', '-m', 'Added there'))
274
278
        os.unlink('sub/a.txt')
 
279
        os.unlink('sub/c.txt')
275
280
        os.rmdir('sub')
 
281
        os.unlink('b.txt')
276
282
        self.runbzr(('commit', '-m', 'Removed a.txt'))
277
283
        os.chdir('../b')
278
284
        print >> file('sub/a.txt', 'ab'), "something"
 
285
        print >> file('b.txt', 'ab'), "something"
 
286
        print >> file('sub/c.txt', 'ab'), "something"
279
287
        self.runbzr(('commit', '-m', 'Modified a.txt'))
280
288
        self.runbzr('merge ../a/')
281
289
        assert os.path.exists('sub/a.txt.THIS')
282
290
        assert os.path.exists('sub/a.txt.BASE')
 
291
        os.chdir('../a')
 
292
        self.runbzr('merge ../b/')
 
293
        assert os.path.exists('sub/a.txt.OTHER')
 
294
        assert os.path.exists('sub/a.txt.BASE')
283
295
 
284
296
    def test_pull(self):
285
297
        """Pull changes from one branch to another."""