← 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 at utoronto
  • Date: 2005-08-25 02:30:04 UTC
  • mto: (1092.1.41) (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: aaron.bentley@utoronto.ca-20050825023004-581548615ae1066d
Made revert clear pending-merges

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
402
402
        a.get_revision_xml(b.last_patch())
403
403
        assert a.pending_merges() == [b.last_patch()], "Assertion %s %s" \
404
404
        % (a.pending_merges(), b.last_patch())
405
 
        a.set_pending_merges([])
 
405
        self.runbzr('revert hello')
 
406
        assert a.pending_merges() == [b.last_patch()], "Assertion %s %s" \
 
407
        % (a.pending_merges(), b.last_patch())
406
408
        self.runbzr('revert')
 
409
        assert a.pending_merges() == [], "Assertion %s %s" \
 
410
        % (a.pending_merges(), b.last_patch())
407
411
        self.runbzr('merge ../b -r2..3')
408
412
        assert a.pending_merges() == [b.last_patch()], "Assertion %s %s" \
409
413
        % (a.pending_merges(), b.last_patch())
410
 
        a.set_pending_merges([])
411
414
        self.runbzr('revert')
412
415
        self.runbzr('merge ../b -r3..3')
413
416
        assert a.pending_merges() == [], "Assertion %s %s" \