← 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
  • Date: 2005-10-21 19:47:06 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1488.
  • Revision ID: abentley@panoramicfeedback.com-20051021194706-1f9e6e0c9b8647f9
Prevented all ancestors from being marked as pending merges

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
335
335
        b = Branch.open('../b')
336
336
        a.get_revision_xml(b.last_revision())
337
337
        self.log('pending merges: %s', a.pending_merges())
338
 
        #        assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
339
 
        #        % (a.pending_merges(), b.last_patch())
 
338
        assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
 
339
            % (a.pending_merges(), b.last_patch())
 
340
        self.runbzr('commit -m merged')
 
341
        self.runbzr('merge ../b -r last:1')
 
342
        self.assertEqual(Branch.open('.').pending_merges(), [])
 
343
 
340
344
 
341
345
    def test_merge_with_missing_file(self):
342
346
        """Merge handles missing file conflicts"""