brz revert fails
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Breezy |
Fix Released
|
Critical
|
Jelmer Vernooij |
Bug Description
I did a brz pull, and it pulled the repo, but then hit an error (which I failed to save). It failed to update the actual files (but I can still branch from it successfully, so the repo is updated).
Now when I try to brz revert to get the working tree to update, I get this error:
> brz revert
brz: ERROR: StopIteration:
Traceback (most recent call last):
File "/usr/local/
return the_callable(*args, **kwargs)
File "/usr/local/
ret = run(*run_argv)
File "/usr/local/
return self.run(
File "/usr/local/
return self._operation
File "/usr/local/
self.cleanups, self.func, *args, **kwargs)
File "/usr/local/
result = func(*args, **kwargs)
File "/usr/local/
self.
File "/usr/local/
report_
File "/usr/local/
report_changes)
File "/usr/local/
delta.
File "/usr/local/
self.
File "/usr/local/
specific_
StopIteration
brz 3.0.1 on python 3.7.4 (Darwin-
arguments: ['/usr/
plugins: bash_completion
commitfromn
fastimport[
netrc_
propose[
weave_
encoding: 'utf-8', fsenc: 'utf-8', lang: 'en_GB.UTF-8'
Related branches
- Martin Packman: Approve
-
Diff: 197 lines (+64/-21)7 files modifiedbreezy/bzr/inventory.py (+6/-0)
breezy/git/tree.py (+9/-8)
breezy/merge.py (+13/-12)
breezy/tests/per_inventory/basics.py (+13/-0)
breezy/tests/per_tree/test_test_trees.py (+5/-0)
breezy/tree.py (+8/-0)
doc/en/release-notes/brz-3.1.txt (+10/-1)
description: | updated |
Changed in brz: | |
status: | New → Triaged |
importance: | Undecided → Critical |
assignee: | nobody → Jelmer Vernooij (jelmer) |
tags: | added: git |
Changed in brz: | |
status: | Triaged → Fix Committed |
milestone: | none → 3.1.0 |
Changed in brz: | |
status: | Fix Committed → Fix Released |
Changed in brz: | |
status: | Fix Released → Fix Committed |
Changed in brz: | |
status: | Fix Committed → Fix Released |
no longer affects: | brz/3.0 |
This issue is fixed in 3.1, but not 3.0. We could possibly backport it to the 3.0 series so it makes it into 3.0.3.