bzr merge with missing revision error message is too long

Bug #248607 reported by Stewart Smith
2
Affects Status Importance Assigned to Milestone
Bazaar
Confirmed
Medium
Unassigned

Bug Description

$ bzr merge ~/Desktop/mysqldump.patch
bzr: ERROR: bzrlib.errors.NoSuchRevision: KnitPackRepository('file:///home/stewart/mysql/.bzr/repository/') has no revision ('volpato@cajarana-20080715052545-2fu5im6ll8o2jr6x',)

Traceback (most recent call last):
  File "/home/stewart/lib/python/bzrlib/commands.py", line 857, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/home/stewart/lib/python/bzrlib/commands.py", line 797, in run_bzr
    ret = run(*run_argv)
  File "/home/stewart/lib/python/bzrlib/commands.py", line 499, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/home/stewart/lib/python/bzrlib/builtins.py", line 2829, in run
    mergeable, pb)
  File "/home/stewart/lib/python/bzrlib/merge.py", line 154, in from_mergeable
    mergeable.get_merge_request(tree.branch.repository)
  File "/home/stewart/lib/python/bzrlib/merge_directive.py", line 541, in get_merge_request
    verified = self._maybe_verify(repository)
  File "/home/stewart/lib/python/bzrlib/merge_directive.py", line 546, in _maybe_verify
    if self._verify_patch(repository):
  File "/home/stewart/lib/python/bzrlib/merge_directive.py", line 527, in _verify_patch
    self.base_revision_id)
  File "/home/stewart/lib/python/bzrlib/merge_directive.py", line 156, in _generate_diff
    tree_1 = repository.revision_tree(ancestor_id)
  File "/home/stewart/lib/python/bzrlib/decorators.py", line 138, in read_locked
    result = unbound(self, *args, **kwargs)
  File "/home/stewart/lib/python/bzrlib/repository.py", line 1652, in revision_tree
    inv = self.get_revision_inventory(revision_id)
  File "/home/stewart/lib/python/bzrlib/decorators.py", line 138, in read_locked
    result = unbound(self, *args, **kwargs)
  File "/home/stewart/lib/python/bzrlib/repository.py", line 1615, in get_revision_inventory
    return self.get_inventory(revision_id)
  File "/home/stewart/lib/python/bzrlib/decorators.py", line 138, in read_locked
    result = unbound(self, *args, **kwargs)
  File "/home/stewart/lib/python/bzrlib/repository.py", line 1508, in get_inventory
    return self.iter_inventories([revision_id]).next()
  File "/home/stewart/lib/python/bzrlib/repository.py", line 1526, in _iter_inventories
    for text, revision_id in self._iter_inventory_xmls(revision_ids):
  File "/home/stewart/lib/python/bzrlib/repository.py", line 1537, in _iter_inventory_xmls
    raise errors.NoSuchRevision(self, record.key)
NoSuchRevision: KnitPackRepository('file:///home/stewart/mysql/.bzr/repository/') has no revision ('volpato@cajarana-20080715052545-2fu5im6ll8o2jr6x',)

bzr 1.6b3 on python 2.5.2 (linux2)
arguments: ['/home/stewart/bin/bzr', 'merge', '/home/stewart/Desktop/mysqldump.patch']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_AU.UTF-8'
plugins:
  bzrtools /home/stewart/.bazaar/plugins/bzrtools [1.6.0]
  diffstat /home/stewart/.bazaar/plugins/diffstat [unknown]
  gtk /home/stewart/.bazaar/plugins/gtk [0.95.0dev1]
  launchpad /home/stewart/lib/python/bzrlib/plugins/launchpad [unknown]
  loom /home/stewart/.bazaar/plugins/loom [1.4.0dev0]
  multiparent /home/stewart/lib/python/bzrlib/plugins/multiparent.py [unknown]
  mysql_plugins /home/stewart/.bazaar/plugins/mysql_plugins [0.3.14]
  rebase /home/stewart/.bazaar/plugins/rebase [0.4.0dev0]
  signing /home/stewart/.bazaar/plugins/signing [unknown]
  svn /home/stewart/.bazaar/plugins/svn [0.4.11exp0]
*** 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.

The error message should be better/shorter.

Jelmer Vernooij (jelmer)
Changed in bzr:
importance: Undecided → Medium
status: New → Triaged
Martin Pool (mbp)
Changed in bzr:
status: Triaged → Confirmed
Jelmer Vernooij (jelmer)
tags: added: merge ui
Jelmer Vernooij (jelmer)
tags: added: check-for-breezy
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.