Committed revision 626.
mathias@colin $ bzr push bzr+ssh://wrtlprnft@bazaar.launchpad.net/~armagetronad-dev/armagetronad/trunk-armagetronad-work
bzr: ERROR: These branches have diverged. Try using "merge" and then "push".
mathias@colin 3 $ bzr rebase ~/armagetronad3/trunk-armagetronad-work
Rebasing on bzr+ssh://wrtlprnft@bazaar.launchpad.net/%7Earmagetronad-dev/armagetronad/trunk-armagetronad-work/
All changes applied successfully.
Committing to: /home/mathias/armagetronad3/trunk-armagetronad-work/
modified src/render/rTexture.cpp
modified src/tools/tResourceManager.cpp
modified src/tools/tResourceManager.h
modified src/tools/tXmlParser.cpp
Committed revision 628.
bzr: ERROR: exceptions.AssertionError: expected parents ['z-man@users.sf.net-20080214170244-1gstsfe9yzyvrx9b'], got ('z-man@users.sf.net-20080214170244-1gstsfe9yzyvrx9b',)
Traceback (most recent call last):
File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 806, in run_bzr_catch_errors
return run_bzr(argv)
File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 762, in run_bzr
ret = run(*run_argv)
File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 492, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 772, in ignore_pipe
result = func(*args, **kwargs)
File "/usr/lib/python2.4/site-packages/bzrlib/plugins/rebase/__init__.py", line 199, in run
workingtree_replay(wt, merge_type=merge_type))
File "/usr/lib/python2.4/site-packages/bzrlib/plugins/rebase/rebase.py", line 285, in rebase
assert repository.revision_parents(newrevid) == newparents, \
AssertionError: expected parents ['z-man@users.sf.net-20080214170244-1gstsfe9yzyvrx9b'], got ('z-man@users.sf.net-20080214170244-1gstsfe9yzyvrx9b',)
bzr 1.1.0 on python 2.4.4.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'rebase']
encoding: 'ANSI_X3.4-1968', fsenc: 'ANSI_X3.4-1968', lang: None
plugins:
bzrtools /usr/lib/python2.4/site-packages/bzrlib/plugins/bzrtools [1.1.0]
launchpad /usr/lib/python2.4/site-packages/bzrlib/plugins/launchpad [unknown]
multiparent /usr/lib/python2.4/site-packages/bzrlib/plugins/multiparent.pyc [unknown]
rebase /usr/lib/python2.4/site-packages/bzrlib/plugins/rebase [0.2.0]
vimdiff /usr/lib/python2.4/site-packages/bzrlib/plugins/vimdiff [unknown]
*** 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.