My local repository is indeed a pack-0.92 and the remote one a dirstate repository.
And it's odd that there would be a revision the server didn't know about. =/ This is a new machine, so it's a fresh checkout and this is the first commit I've made locally. And no one else is working on the code or anything, just me.
Anyhoo... the results of "bzr push -r revid:cyli@jinchuuriki-20080618141543-2hq42qg2ep9xy880" and then a "bzr push":
jinchuuriki:wordnumbers cyli$ bzr push
Using saved location: bzr+ssh://legion/home/cyli/Tonkatsu/Projects/wordnumbers/
This transport does not update the working tree of: bzr+ssh://legion/home/cyli/Tonkatsu/Projects/wordnumbers/. See 'bzr help working-trees' for more information.
Server is too old for fast get_parent_map, reconnecting. (Upgrade the server to Bazaar 1.2 to avoid this)
bzr: ERROR: exceptions.AssertionError: 6 != 7
Traceback (most recent call last):
File "/Library/Python/2.5/site-packages/bzrlib/commands.py", line 846, in run_bzr_catch_errors
return run_bzr(argv)
File "/Library/Python/2.5/site-packages/bzrlib/commands.py", line 797, in run_bzr
ret = run(*run_argv)
File "/Library/Python/2.5/site-packages/bzrlib/commands.py", line 499, in run_argv_aliases
return self.run(**all_cmd_args)
File "/Library/Python/2.5/site-packages/bzrlib/builtins.py", line 856, in run
stop_revision=revision_id)
File "/Library/Python/2.5/site-packages/bzrlib/decorators.py", line 127, in read_locked
return unbound(self, *args, **kwargs)
File "/Library/Python/2.5/site-packages/bzrlib/branch.py", line 1612, in push
_override_hook_source_branch=_override_hook_source_branch)
File "/Library/Python/2.5/site-packages/bzrlib/branch.py", line 1654, in _push_with_bound_branches
result = self._basic_push(target, overwrite, stop_revision)
File "/Library/Python/2.5/site-packages/bzrlib/branch.py", line 1673, in _basic_push
target.update_revisions(self, stop_revision)
File "/Library/Python/2.5/site-packages/bzrlib/remote.py", line 1537, in update_revisions
other, stop_revision=stop_revision, overwrite=overwrite)
File "/Library/Python/2.5/site-packages/bzrlib/decorators.py", line 165, in write_locked
return unbound(self, *args, **kwargs)
File "/Library/Python/2.5/site-packages/bzrlib/branch.py", line 1536, in update_revisions
other_last_revision)
File "/Library/Python/2.5/site-packages/bzrlib/decorators.py", line 165, in write_locked
return unbound(self, *args, **kwargs)
File "/Library/Python/2.5/site-packages/bzrlib/branch.py", line 1452, in set_last_revision_info
raise AssertionError('%d != %d' % (len(history), revno))
AssertionError: 6 != 7
bzr 1.5 on python 2.5.1 (darwin)
arguments: ['/usr/local/bin/bzr', 'push']
encoding: 'UTF-8', fsenc: 'utf-8', lang: 'en_US.UTF-8'
plugins:
bzrtools /Library/Python/2.5/site-packages/bzrlib/plugins/bzrtools [1.5.0]
launchpad /Library/Python/2.5/site-packages/bzrlib/plugins/launchpad [unknown]
qbzr /Library/Python/2.5/site-packages/bzrlib/plugins/qbzr [0.9.0]
rebase /Library/Python/2.5/site-packages/bzrlib/plugins/rebase [0.3.0dev0]
*** Bazaar has encountered an internal error.
Please report a bug at https://bugs.launchpad.net/bzr/+filebug
including this traceback, and a description of what you
were doing when the error occurred.
My local repository is indeed a pack-0.92 and the remote one a dirstate repository.
And it's odd that there would be a revision the server didn't know about. =/ This is a new machine, so it's a fresh checkout and this is the first commit I've made locally. And no one else is working on the code or anything, just me.
Anyhoo... the results of "bzr push -r revid:cyli@ jinchuuriki- 20080618141543- 2hq42qg2ep9xy88 0" and then a "bzr push":
jinchuuriki: wordnumbers cyli$ bzr push //legion/ home/cyli/ Tonkatsu/ Projects/ wordnumbers/ //legion/ home/cyli/ Tonkatsu/ Projects/ wordnumbers/ . See 'bzr help working-trees' for more information. AssertionError: 6 != 7
Using saved location: bzr+ssh:
This transport does not update the working tree of: bzr+ssh:
Server is too old for fast get_parent_map, reconnecting. (Upgrade the server to Bazaar 1.2 to avoid this)
bzr: ERROR: exceptions.
Traceback (most recent call last): Python/ 2.5/site- packages/ bzrlib/ commands. py", line 846, in run_bzr_ catch_errors Python/ 2.5/site- packages/ bzrlib/ commands. py", line 797, in run_bzr Python/ 2.5/site- packages/ bzrlib/ commands. py", line 499, in run_argv_aliases **all_cmd_ args) Python/ 2.5/site- packages/ bzrlib/ builtins. py", line 856, in run revision= revision_ id) Python/ 2.5/site- packages/ bzrlib/ decorators. py", line 127, in read_locked Python/ 2.5/site- packages/ bzrlib/ branch. py", line 1612, in push hook_source_ branch= _override_ hook_source_ branch) Python/ 2.5/site- packages/ bzrlib/ branch. py", line 1654, in _push_with_ bound_branches push(target, overwrite, stop_revision) Python/ 2.5/site- packages/ bzrlib/ branch. py", line 1673, in _basic_push update_ revisions( self, stop_revision) Python/ 2.5/site- packages/ bzrlib/ remote. py", line 1537, in update_revisions stop_revision, overwrite= overwrite) Python/ 2.5/site- packages/ bzrlib/ decorators. py", line 165, in write_locked Python/ 2.5/site- packages/ bzrlib/ branch. py", line 1536, in update_revisions last_revision) Python/ 2.5/site- packages/ bzrlib/ decorators. py", line 165, in write_locked Python/ 2.5/site- packages/ bzrlib/ branch. py", line 1452, in set_last_ revision_ info
File "/Library/
return run_bzr(argv)
File "/Library/
ret = run(*run_argv)
File "/Library/
return self.run(
File "/Library/
stop_
File "/Library/
return unbound(self, *args, **kwargs)
File "/Library/
_override_
File "/Library/
result = self._basic_
File "/Library/
target.
File "/Library/
other, stop_revision=
File "/Library/
return unbound(self, *args, **kwargs)
File "/Library/
other_
File "/Library/
return unbound(self, *args, **kwargs)
File "/Library/
raise AssertionError('%d != %d' % (len(history), revno))
AssertionError: 6 != 7
bzr 1.5 on python 2.5.1 (darwin) local/bin/ bzr', 'push'] Python/ 2.5/site- packages/ bzrlib/ plugins/ bzrtools [1.5.0] Python/ 2.5/site- packages/ bzrlib/ plugins/ launchpad [unknown] Python/ 2.5/site- packages/ bzrlib/ plugins/ qbzr [0.9.0] Python/ 2.5/site- packages/ bzrlib/ plugins/ rebase [0.3.0dev0] /bugs.launchpad .net/bzr/ +filebug
arguments: ['/usr/
encoding: 'UTF-8', fsenc: 'utf-8', lang: 'en_US.UTF-8'
plugins:
bzrtools /Library/
launchpad /Library/
qbzr /Library/
rebase /Library/
*** Bazaar has encountered an internal error.
Please report a bug at https:/
including this traceback, and a description of what you
were doing when the error occurred.