← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_commit.py
19
19
 
20
20
from bzrlib import (
21
21
    branch,
 
22
    bzrdir,
22
23
    conflicts,
23
 
    controldir,
24
24
    errors,
25
25
    mutabletree,
26
26
    osutils,
27
27
    revision as _mod_revision,
28
28
    tests,
29
 
    transport as _mod_transport,
30
29
    ui,
31
30
    )
32
31
from bzrlib.tests.per_workingtree import TestCaseWithWorkingTree
265
264
        del master
266
265
        # check its corrupted.
267
266
        self.assertRaises(errors.UnknownFormatError,
268
 
                          controldir.ControlDir.open,
 
267
                          bzrdir.BzrDir.open,
269
268
                          'master')
270
269
        tree.commit('foo', rev_id='foo', local=True)
271
270
 
317
316
        wt.lock_write()
318
317
        self.build_tree(['a', 'b/', 'b/c', 'd'])
319
318
        wt.add(['a', 'b', 'b/c', 'd'], ['a-id', 'b-id', 'c-id', 'd-id'])
320
 
        this_dir = wt.bzrdir.root_transport
 
319
        this_dir = self.get_transport()
321
320
        this_dir.delete_tree('b')
322
321
        this_dir.delete('d')
323
322
        # now we have a tree with a through d in the inventory, but only
353
352
        wt.add(['a', 'b', 'b/c'], ['a-id', 'b-id', 'c-id'])
354
353
        wt.commit('first')
355
354
        wt.remove('b/c')
356
 
        this_dir = wt.bzrdir.root_transport
 
355
        this_dir = self.get_transport()
357
356
        this_dir.delete_tree('b')
358
357
        wt.lock_write()
359
358
        wt.commit('commit deleted rename')