On Windows XP with bzr version 1.5. I get the following trace after moving two files with bzr mv while there where pending merges in the tree. Note I haven't been doing double merges or --force merges.
F:\working\matlab>bzr version
Bazaar (bzr) 1.5
Python interpreter: F:\Program Files\Bazaar\python25.dll 2.5.2
Python standard library: F:\Program Files\Bazaar\lib\library.zip
bzrlib: F:\Program Files\Bazaar\lib\library.zip\bzrlib
Bazaar configuration: F:\Documents and Settings\patrickd\Application Data\baza
ar\2.0
Bazaar log file: F:\Documents and Settings\patrickd\My Documents\.bzr.log
F:\working\matlab>bzr status
renamed:
NewSelectionFunctionRequirements => NewSelectionFunctionRequirements.txt
ThesisGraphRequirements => ThesisGraphRequirements.txt
modified:
ga/gaUsingNewRouting.m
ga/routingAwareDamaged.m
ga/setupRun_Start.m
unknown:
ga/start.png
pending merges:
Patrick Dempster 2008-07-09 testing the checkin in bzr
bzr: ERROR: exceptions.KeyError: 'pop(): dictionary is empty'
Traceback (most recent call last):
File "bzrlib\commands.pyc", line 846, in run_bzr_catch_errors
File "bzrlib\commands.pyc", line 797, in run_bzr
File "bzrlib\commands.pyc", line 499, in run_argv_aliases
File "bzrlib\commands.pyc", line 807, in ignore_pipe
File "bzrlib\builtins.pyc", line 178, in run
File "bzrlib\status.pyc", line 142, in show_tree_status
File "bzrlib\status.pyc", line 235, in show_pending_merges
File "bzrlib\status.pyc", line 172, in _get_sorted_revisions
File "bzrlib\tsort.pyc", line 412, in __init__
KeyError: 'pop(): dictionary is empty'
On Windows XP with bzr version 1.5. I get the following trace after moving two files with bzr mv while there where pending merges in the tree. Note I haven't been doing double merges or --force merges.
F:\working\ matlab> bzr version python25. dll 2.5.2 lib\library. zip lib\library. zip\bzrlib patrickd\ Application Data\baza patrickd\ My Documents\.bzr.log
Bazaar (bzr) 1.5
Python interpreter: F:\Program Files\Bazaar\
Python standard library: F:\Program Files\Bazaar\
bzrlib: F:\Program Files\Bazaar\
Bazaar configuration: F:\Documents and Settings\
ar\2.0
Bazaar log file: F:\Documents and Settings\
F:\working\ matlab> bzr status unctionRequirem ents => NewSelectionFun ctionRequiremen ts.txt quirements => ThesisGraphRequ irements. txt Routing. m reDamaged. m Start.m KeyError: 'pop(): dictionary is empty'
renamed:
NewSelectionF
ThesisGraphRe
modified:
ga/gaUsingNew
ga/routingAwa
ga/setupRun_
unknown:
ga/start.png
pending merges:
Patrick Dempster 2008-07-09 testing the checkin in bzr
bzr: ERROR: exceptions.
Traceback (most recent call last): commands. pyc", line 846, in run_bzr_ catch_errors commands. pyc", line 797, in run_bzr commands. pyc", line 499, in run_argv_aliases commands. pyc", line 807, in ignore_pipe builtins. pyc", line 178, in run status. pyc", line 142, in show_tree_status status. pyc", line 235, in show_pending_merges status. pyc", line 172, in _get_sorted_ revisions
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\
File "bzrlib\tsort.pyc", line 412, in __init__
KeyError: 'pop(): dictionary is empty'
bzr 1.5 on python 2.5.2 (win32) patrickd\ Application Data\bazaa bzrtools [1.5.0] plugins\ launchpad [unknown] patrickd\ Application Data\bazaa
arguments: ['bzr', 'status']
encoding: 'cp1252', fsenc: 'mbcs', lang: None
plugins:
bzrtools F:\Documents and Settings\
r\2.0\plugins\
launchpad F:\Program Files\Bazaar\
qbzr F:\Documents and Settings\
r\2.0\plugins\qbzr [0.9.0]