Comment 1 for bug 594958

Revision history for this message
Bruce Mutton (dangle) wrote :

Ditto me. Have successfully merged patch into my trunk once previously, and a number of local feature branch merges as well.
Now patch command (not tried by me before) gives messages like;

Run command: bzr patch "C:/Documents and Settings/Bruce/My Documents/Bruce/Outdoor/Cave/Therion Data and Notes/th_RiwakaCaveSystemData/MikesS...
bzr: ERROR: Error invoking patch: No such file or directory

Run command: bzr patch ../MikesSwissMaidBranch-28.patch
bzr: ERROR: Error invoking patch: No such file or directory

and merge gives message like;

bzr: ERROR: exceptions.IndexError: list index out of range

Traceback (most recent call last):
  File "bzrlib\commands.pyo", line 853, in exception_to_return_code
  File "bzrlib\commands.pyo", line 1055, in run_bzr
  File "bzrlib\commands.pyo", line 661, in run_argv_aliases
  File "bzrlib\commands.pyo", line 665, in run_direct
  File "bzrlib\cleanup.pyo", line 122, in run_simple
  File "bzrlib\cleanup.pyo", line 156, in _do_with_cleanups
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\commands.py", line 788, in run
  File "C:/Program Files/Bazaar/plugins\qbzr\lib\subprocess.py", line 786, in run_subprocess_command
  File "bzrlib\commands.pyo", line 1055, in run_bzr
  File "bzrlib\commands.pyo", line 661, in run_argv_aliases
  File "bzrlib\commands.pyo", line 665, in run_direct
  File "bzrlib\cleanup.pyo", line 122, in run_simple
  File "bzrlib\cleanup.pyo", line 156, in _do_with_cleanups
  File "bzrlib\builtins.pyo", line 3783, in run
  File "bzrlib\merge.pyo", line 321, in from_mergeable
  File "bzrlib\merge_directive.pyo", line 240, in install_revisions
  File "bzrlib\bundle\serializer\v4.pyo", line 471, in install_revisions
  File "bzrlib\bundle\serializer\v4.pyo", line 539, in install
  File "bzrlib\bundle\serializer\v4.pyo", line 569, in _install_in_write_group
  File "bzrlib\bundle\serializer\v4.pyo", line 690, in _install_inventory_records
  File "bzrlib\multiparent.pyo", line 167, in to_lines
  File "bzrlib\multiparent.pyo", line 502, in get_line_list
  File "bzrlib\multiparent.pyo", line 512, in cache_version
  File "bzrlib\multiparent.pyo", line 661, in reconstruct_version
  File "bzrlib\multiparent.pyo", line 654, in _reconstruct
IndexError: list index out of range

bzr 2.1.1 on python 2.5.4 (Windows-XP-5.1.2600-SP3)
arguments: ['C:\\Program Files\\Bazaar\\bzr.exe', 'qsubprocess', '--bencode', 'l5:merge140:C:/Documents and Settings/Bruce/My Documents/Bruce/Outdoor/Cave/Therion Data and Notes/th_RiwakaCaveSystemData/MikesSwissMaidBranch-28.patch11:--directory116:C:/Documents and Settings/Bruce/My Documents/Bruce/Outdoor/Cave/Therion Data and Notes/th_RiwakaCaveSystemData/trunke']
encoding: 'cp1252', fsenc: 'mbcs', lang: None
plugins:
  bzrtools C:\Program Files\Bazaar\plugins\bzrtools [2.1.0]
  explorer C:\Program Files\Bazaar\plugins\explorer [1.0.1]
  launchpad C:\Program Files\Bazaar\plugins\launchpad [2.1.1]
  netrc_credential_store C:\Program Files\Bazaar\plugins\netrc_credential_store [2.1.1]
  news_merge C:\Program Files\Bazaar\plugins\news_merge [2.1.1]
  qbzr C:\Program Files\Bazaar\plugins\qbzr [0.18.4]
  rebase C:\Program Files\Bazaar\plugins\rebase [0.5.5]
  svn C:\Program Files\Bazaar\plugins\svn [1.0.2]
  upload C:\Program Files\Bazaar\plugins\upload [1.0.0dev]
  xmloutput C:\Program Files\Bazaar\plugins\xmloutput [0.8.7.dev]

*** Bazaar has encountered an internal error. This probably indicates a
    bug in Bazaar. You can help us fix it by filing a bug report at
        https://bugs.launchpad.net/bzr/+filebug
    including this traceback and a description of the problem.

That "/trunke']" at the end of one of the lines above perplexes me. The actual path ends like "/trunk"
All was working well for a while, and now we seem to be stuck.