← 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:10: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-20050825021004-a7afd22f3dd52b2e
pending merges, common ancestor work properly

Show diffs side-by-side

added added

removed removed

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