← 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: John Arbash Meinel
  • Date: 2009-07-24 18:26:21 UTC
  • mfrom: (4567 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4568.
  • Revision ID: john@arbash-meinel.com-20090724182621-68s2jhoqf3pn72n7
Merge bzr.dev 4567 to resolve NEWS

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])