← Back to branch summary

~cjwatson/bzr/bzr-2.6.0-lp-2

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_commit.py

  • Committer: Patch Queue Manager
  • Date: 2012-09-19 08:27:25 UTC
  • mfrom: (6562.1.1 2.6-merge-up-2.5)
  • Revision ID: pqm@pqm.ubuntu.com-20120919082725-dzvmca37zj5xx2hh
(jam) Merge bzr-2.5.2-dev into bzr trunk to get the ConnectionReset
        fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_commit.py
26
26
    osutils,
27
27
    revision as _mod_revision,
28
28
    tests,
 
29
    transport as _mod_transport,
29
30
    ui,
30
31
    )
31
32
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
316
317
        wt.lock_write()
317
318
        self.build_tree(['a', 'b/', 'b/c', 'd'])
318
319
        wt.add(['a', 'b', 'b/c', 'd'], ['a-id', 'b-id', 'c-id', 'd-id'])
319
 
        this_dir = self.get_transport()
 
320
        this_dir = wt.bzrdir.root_transport
320
321
        this_dir.delete_tree('b')
321
322
        this_dir.delete('d')
322
323
        # now we have a tree with a through d in the inventory, but only
352
353
        wt.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
353
354
        wt.commit('first')
354
355
        wt.remove('b/c')
355
 
        this_dir = self.get_transport()
 
356
        this_dir = wt.bzrdir.root_transport
356
357
        this_dir.delete_tree('b')
357
358
        wt.lock_write()
358
359
        wt.commit('commit deleted rename')