/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_commit.py
18
18
from cStringIO import StringIO
19
19
import os
20
20
 
21
 
from bzrlib import branch, bzrdir, errors, ui, workingtree
 
21
from bzrlib import (
 
22
    branch,
 
23
    bzrdir,
 
24
    errors,
 
25
    revision as _mod_revision,
 
26
    ui,
 
27
    uncommit,
 
28
    workingtree,
 
29
    )
22
30
from bzrlib.errors import (NotBranchError, NotVersionedError, 
23
31
                           UnsupportedOperation)
24
32
from bzrlib.osutils import pathjoin, getcwd, has_symlinks
152
160
            return
153
161
        tree.commit('foo', rev_id='foo', local=True)
154
162
        self.failIf(master.repository.has_revision('foo'))
155
 
        self.assertEqual(None, master.last_revision())
 
163
        self.assertEqual(_mod_revision.NULL_REVISION,
 
164
                         (_mod_revision.ensure_null(master.last_revision())))
156
165
 
157
166
    def test_record_initial_ghost(self):
158
167
        """The working tree needs to record ghosts during commit."""
378
387
             ],
379
388
            factory._calls
380
389
           )
 
390
 
 
391
 
 
392