~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_update.py

  • Committer: John Arbash Meinel
  • Date: 2007-07-18 20:42:38 UTC
  • mfrom: (2625 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2643.
  • Revision ID: john@arbash-meinel.com-20070718204238-5gi11fx04q7zt72d
[merge] bzr.dev 2625

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
 
18
 
import bzrlib.errors as errors
 
18
from bzrlib import (
 
19
    errors,
 
20
    revision as _mod_revision,
 
21
    )
19
22
from bzrlib.tests.branch_implementations.test_branch import TestCaseWithBranch
20
23
 
21
24
 
27
30
    def test_update_unbound_works(self):
28
31
        b = self.make_branch('.')
29
32
        b.update()
30
 
        self.assertEqual(None, b.last_revision())
 
33
        self.assertEqual(_mod_revision.NULL_REVISION,
 
34
                         _mod_revision.ensure_null(b.last_revision()))
31
35
 
32
36
    def test_update_prefix_returns_none(self):
33
37
        # update in a branch when its a prefix of the master should