← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

  • Committer: Martin Pool
  • Date: 2005-08-17 08:32:56 UTC
  • Revision ID: mbp@sourcefrog.net-20050817083255-894936d5aebf7a95
- merge merge improvements from aaron

  revisions to merge are now specified by the -r parameter; the 
  /@ syntax is no longer needed

  abentley@panoramicfeedback.com-20050811205739-dc1988c004f9503e

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
361
361
        file('hello', 'wt').write('foo')
362
362
        self.runbzr('add hello')
363
363
        self.runbzr('commit -m setup hello')
 
364
 
 
365
        file('goodbye', 'wt').write('baz')
 
366
        self.runbzr('add goodbye')
 
367
        self.runbzr('commit -m setup goodbye')
364
368
        
365
369
        file('hello', 'wt').write('bar')
 
370
        file('goodbye', 'wt').write('qux')
366
371
        self.runbzr('revert hello')
367
372
        self.check_file_contents('hello', 'foo')
 
373
        self.check_file_contents('goodbye', 'qux')
 
374
        self.runbzr('revert')
 
375
        self.check_file_contents('goodbye', 'baz')
368
376