← 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-23 05:25:51 UTC
  • mto: (1092.1.41) (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1110.
  • Revision ID: aaron.bentley@utoronto.ca-20050823052551-f3401a8b57d9126f
Committed it even though the test case doesn't work

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
397
397
        self.runbzr('merge ../b')
398
398
        self.check_file_contents('goodbye', 'quux')
399
399
        # Merging a branch pulls its revision into the tree
400
 
        Branch('.').get_revision_xml(Branch('../b').last_patch())
 
400
        a = Branch('.')
 
401
        b = Branch('../b')
 
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