The sequence at the top now fails with the following error instead:
All changes applied successfully.
bzr: ERROR: bzrlib.errors.ReservedId: Reserved revision-id {null:}
Traceback (most recent call last):
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/commands.py", line 800, in run_bzr_catch_errors
return run_bzr(argv)
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/commands.py", line 758, in run_bzr
ret = run(*run_argv)
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/commands.py", line 492, in run_argv_aliases
return self.run(**all_cmd_args)
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/builtins.py", line 1039, in run
possible_transports=possible_transports)
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/workingtree.py", line 2061, in update
return self._update_tree(old_tip, change_reporter)
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/mutabletree.py", line 50, in tree_write_locked
return unbound(self, *args, **kwargs)
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/workingtree.py", line 2119, in _update_tree
self.set_parent_trees(parent_trees)
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/mutabletree.py", line 50, in tree_write_locked
return unbound(self, *args, **kwargs)
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/workingtree_4.py", line 1099, in set_parent_trees
_mod_revision.check_not_reserved_id(rev_id)
File "/home/jw2328/devel/bzr/bzr.dev/bzrlib/revision.py", line 451, in check_not_reserved_id
raise errors.ReservedId(revision_id)
ReservedId: Reserved revision-id {null:}
On (14/09/07 16:54), Martin Pool wrote: /bugs.launchpad .net/bzr/ +bug/120968 "bzr update" in
> This is https:/
> checkout of empty branch fails and breaks dirstate
The sequence at the top now fails with the following error instead:
All changes applied successfully. errors. ReservedId: Reserved revision-id {null:}
bzr: ERROR: bzrlib.
Traceback (most recent call last): jw2328/ devel/bzr/ bzr.dev/ bzrlib/ commands. py", line 800, in run_bzr_ catch_errors jw2328/ devel/bzr/ bzr.dev/ bzrlib/ commands. py", line 758, in run_bzr jw2328/ devel/bzr/ bzr.dev/ bzrlib/ commands. py", line 492, in run_argv_aliases **all_cmd_ args) jw2328/ devel/bzr/ bzr.dev/ bzrlib/ builtins. py", line 1039, in run transports= possible_ transports) jw2328/ devel/bzr/ bzr.dev/ bzrlib/ workingtree. py", line 2061, in update tree(old_ tip, change_reporter) jw2328/ devel/bzr/ bzr.dev/ bzrlib/ mutabletree. py", line 50, in tree_write_locked jw2328/ devel/bzr/ bzr.dev/ bzrlib/ workingtree. py", line 2119, in _update_tree set_parent_ trees(parent_ trees) jw2328/ devel/bzr/ bzr.dev/ bzrlib/ mutabletree. py", line 50, in tree_write_locked jw2328/ devel/bzr/ bzr.dev/ bzrlib/ workingtree_ 4.py", line 1099, in set_parent_trees revision. check_not_ reserved_ id(rev_ id) jw2328/ devel/bzr/ bzr.dev/ bzrlib/ revision. py", line 451, in check_not_ reserved_ id ReservedId( revision_ id)
File "/home/
return run_bzr(argv)
File "/home/
ret = run(*run_argv)
File "/home/
return self.run(
File "/home/
possible_
File "/home/
return self._update_
File "/home/
return unbound(self, *args, **kwargs)
File "/home/
self.
File "/home/
return unbound(self, *args, **kwargs)
File "/home/
_mod_
File "/home/
raise errors.
ReservedId: Reserved revision-id {null:}
presumably with Aaron's null: changes.
Here is a testcase to exercise this bug:
=== modified file 'bzrlib/ tests/blackbox/ test_update. py' tests/blackbox/ test_update. py 2007-08-08 02:01:10 +0000 tests/blackbox/ test_update. py 2007-09-14 16:36:30 +0000
lightweight= True)
tree. commit( 'empty commit')
self. run_bzr( 'update checkout') checkout_ of_empty_ branch( self): branch_ and_tree( 'branch' ) create_ checkout( 'checkout' , lightweight=False) commit( 'empty commit', local=True) bzr('update checkout')
--- bzrlib/
+++ bzrlib/
@@ -210,3 +210,11 @@
+
+ def test_update_
+ """Run update in a checkout of an empty branch: #438137."""
+ tree = self.make_
+ checkout = tree.branch.
+ checkout.
+ self.run_
+
-- jameswestby. net/ M*edCX/ .A:n*N! >|&7U.L# 9E)Tu)T0> AM - secp256r1/nistp256
James Westby -- GPG Key ID: B577FE13 -- http://
seccure key - (3+)k7|