← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_smart.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-07-20 08:56:45 UTC
  • mfrom: (4526.9.23 apply-inventory-delta)
  • Revision ID: pqm@pqm.ubuntu.com-20090720085645-54mtgybxua0yx6hw
(robertc) Add checks for inventory deltas which try to ensure that
        deltas that are not an exact fit are not applied. (Robert
        Collins, bug 397705, bug 367633)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart.py
1190
1190
        backing = self.get_transport()
1191
1191
        request = smart.repository.SmartServerRepositoryGetRevIdForRevno(backing)
1192
1192
        parent = self.make_branch_and_memory_tree('parent', format='1.9')
 
1193
        parent.lock_write()
 
1194
        parent.add([''], ['TREE_ROOT'])
1193
1195
        r1 = parent.commit(message='first commit')
1194
1196
        r2 = parent.commit(message='second commit')
 
1197
        parent.unlock()
1195
1198
        local = self.make_branch_and_memory_tree('local', format='1.9')
1196
1199
        local.branch.pull(parent.branch)
1197
1200
        local.set_parent_ids([r2])