← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

https://launchpad.net/bugs/819604
Merge the fix for bug #819604 into trunk, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
28
28
    merge,
29
29
    osutils,
30
30
    revision as _mod_revision,
 
31
    symbol_versioning,
31
32
    tests,
32
33
    treebuilder,
33
34
    )
509
510
                new.unlock()
510
511
                old.unlock()
511
512
        if not _mod_revision.is_null(rev_id):
512
 
            tree.branch.generate_revision_history(rev_id)
 
513
            rh = self.b1.revision_history()
 
514
            self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
 
515
                tree.branch.set_revision_history, rh[:rh.index(rev_id)+1])
513
516
            tree.update()
514
517
            delta = tree.changes_from(self.b1.repository.revision_tree(rev_id))
515
518
            self.assertFalse(delta.has_changed(),