← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_inv.py

  • Committer: Aaron Bentley
  • Date: 2006-02-24 21:45:18 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1595.
  • Revision ID: abentley@panoramicfeedback.com-20060224214518-9c9b7a8f5c9a2ca0
Added test case for file not added by merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_inv.py
507
507
        other.add('c')
508
508
 
509
509
        open('b1/b', 'wb').write('q test\n')
 
510
        open('b1/d', 'wb').write('d test\n')
510
511
        merge_inner(this.branch, other, base, this_tree=this)
511
512
        self.assertNotEqual(open('b1/a', 'rb').read(), 'a test\n')
512
513
        this.revert([])
514
515
        self.assertIs(os.path.exists('b1/b~'), True)
515
516
        self.assertIs(os.path.exists('b1/c'), False)
516
517
        self.assertIs(os.path.exists('b1/a~'), False)
 
518
        self.assertIs(os.path.exists('b1/d'), True)