← 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 04:08:58 UTC
  • mfrom: (1185.10.11)
  • mto: (1185.12.13)
  • mto: This revision was merged to the branch mainline in revision 1419.
  • Revision ID: aaron.bentley@utoronto.ca-20050930040858-a6d383d9c88bc2cf
Merged bzr.24 fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
303
303
        os.chdir('a')
304
304
        os.mkdir('sub')
305
305
        print >> file('sub/a.txt', 'wb'), "hello"
 
306
        print >> file('b.txt', 'wb'), "hello"
 
307
        print >> file('sub/c.txt', 'wb'), "hello"
306
308
        self.runbzr('init')
307
309
        self.runbzr('add')
308
310
        self.runbzr(('commit', '-m', 'added a'))
309
311
        self.runbzr('branch . ../b')
310
312
        print >> file('sub/a.txt', 'ab'), "there"
 
313
        print >> file('b.txt', 'ab'), "there"
 
314
        print >> file('sub/c.txt', 'ab'), "there"
311
315
        self.runbzr(('commit', '-m', 'Added there'))
312
316
        os.unlink('sub/a.txt')
 
317
        os.unlink('sub/c.txt')
313
318
        os.rmdir('sub')
 
319
        os.unlink('b.txt')
314
320
        self.runbzr(('commit', '-m', 'Removed a.txt'))
315
321
        os.chdir('../b')
316
322
        print >> file('sub/a.txt', 'ab'), "something"
 
323
        print >> file('b.txt', 'ab'), "something"
 
324
        print >> file('sub/c.txt', 'ab'), "something"
317
325
        self.runbzr(('commit', '-m', 'Modified a.txt'))
318
326
        self.runbzr('merge ../a/')
319
327
        assert os.path.exists('sub/a.txt.THIS')
320
328
        assert os.path.exists('sub/a.txt.BASE')
 
329
        os.chdir('../a')
 
330
        self.runbzr('merge ../b/')
 
331
        assert os.path.exists('sub/a.txt.OTHER')
 
332
        assert os.path.exists('sub/a.txt.BASE')
321
333
 
322
334
    def test_pull(self):
323
335
        """Pull changes from one branch to another."""