← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

  • Committer: Martin Pool
  • Date: 2005-09-16 07:38:10 UTC
  • Revision ID: mbp@sourcefrog.net-20050916073810-1f358be198c9ed91
- fix bug in committing files that are renamed but not modified

- add test for this

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
216
216
        # Merging a branch pulls its revision into the tree
217
217
        a = Branch('.')
218
218
        b = Branch('../b')
219
 
        a.get_revision_xml(b.last_patch())
 
219
        a.get_revision_xml(b.last_revision())
220
220
 
221
221
        self.log('pending merges: %s', a.pending_merges())
222
 
        #        assert a.pending_merges() == [b.last_patch()], "Assertion %s %s" \
223
 
        #        % (a.pending_merges(), b.last_patch())
 
222
        #        assert a.pending_merges() == [b.last_revision()], "Assertion %s %s" \
 
223
        #        % (a.pending_merges(), b.last_revision())
224
224
 
225
225
 
226
226
    def test_add_reports(self):