Yep, this is the same repo that I can't run 'brz revert' on, so I keep pulling and causing more conflicts, but can then branch from it fine.
> git fsck
Checking object directories: 100% (256/256), done.
Checking objects: 100% (32548/32548), done.
dangling blob 8e1182f883ea4e3697ff85e12c9581514b11e41f
dangling blob b91e0ee1ee24ce02c09ec2d70b78e7fedcc9dc96
dangling blob 4027c81f19808e55d5fc3023637c8f9df0a0e6c5
dangling blob 4f28c26ad2f2a22871e8b717bf35b6bea24a685e
dangling blob 3939b42848253fffcfab9af0d9cbacf0866e101c
dangling tree f33c8ef535aec72e55ce191e65966757fe0907e8
dangling blob 1c3f10aeefe3df7a90a898bcc6d83c5562a4603d
dangling blob 074b249f77df18a042d1c834674ebcf32320341b
dangling blob 805190d406050db7170f44b728379e784fef3b0c
dangling blob 355200c32de40d98bdf7ba950156ec4b0137c42d
dangling blob 815cc4c1cd411b4334a9e5639b857d8e5bc47f68
dangling tree da66122f1b1a410cd98efa5133d8516a6043a0a9
dangling tree 1679b26360b963d352cbe38ff32f9a216f4511be
dangling tree 2a89968f712b8cff212808fce38f1701b8fc0c76
dangling tree 01b73ed8e49065b51b67c367ed77ddaeddfc5e82
dangling blob e5bbf4691847eb5c1efa4f5e7230df23b3cdb945
dangling tree 16c3cccb7573fd758a2cca4201787011578bffc5
dangling blob 5cf7303e6d2a1d815e2bbca2fc91ab60c756ba5d
dangling blob 3e0c8d88af336fab891adabad089b53727e752dc
dangling blob be0c13b1527218bb10b330c8064665328fca6d8f
dangling blob 1b0e01822fcbb0271d8b7d4bcddac9c40692af8b
dangling blob f00ffff92736203249150fd69dd50f0e3de03293
dangling blob f71485a1eef926fcdf35857691a6539cafd6fff8
dangling blob 7c18d54ce7644677f6ee7f3145035f176a7bbf4d
dangling blob 8125f19347c4f724e8a847d085da43b4ba011622
dangling blob bb2c8b7c7f6904a2c2ca07da8b9ed6250b2f86fc
dangling blob 2d47a50a91fba5394a0ceb0c6736bacf91df1165
dangling tree 1962d3ed5cf985cdb1386d650d837918ffd4d83b
dangling blob dc692744e47312190176e4f41e2e19d3d4504098
dangling tree 6e6b793d075e2869dce2c098af9673e8c22a5c44
dangling tree 997d19e80a8b648e31edb2549ad9fa89939e2da5
dangling blob 93ab4d24eef874955066a58c033de3346339dd43
dangling blob edb84fa9468e561c066ccf7c455a8aa2d95b2de6
dangling tree f9c9819601cea4235c9ec57e26ec05609e698c28
dangling blob 78d1f3dd4308d5164d848ef31656a5b02376b807
dangling blob 2ed2134a4091b691992a931f33a5b84e90e2fcac
dangling tree 71d2550007fd8811154b925ab58f77c3db755e64
dangling tree efd56f39765bd8fedcc168eb8505800c5a727ee2
dangling tree 4fd875b82b0b4c7faa8c8ddb07f59c5d2ec7267d
dangling tree a6d805a4dcde5baca7a555ed6371f09ddcdaddbf
dangling blob 0dda3f173b53f339052bef0c31ccc46e3c3e8a53
dangling blob 67dae9db9cf0f5d13f5853daa377d3c67d47a82d
After running that, and updating to 3.0.2, creating a branch is working again. However, revert is still failing (I think that bug was marked as fixed):
> brz revert
brz: ERROR: StopIteration:
Traceback (most recent call last):
File "/usr/local/lib/python3.7/site-packages/breezy/commands.py", line 1016, in exception_to_return_code
return the_callable(*args, **kwargs)
File "/usr/local/lib/python3.7/site-packages/breezy/commands.py", line 1202, in run_bzr
ret = run(*run_argv)
File "/usr/local/lib/python3.7/site-packages/breezy/commands.py", line 759, in run_argv_aliases
return self.run(**all_cmd_args)
File "/usr/local/lib/python3.7/site-packages/breezy/commands.py", line 784, in run
return self._operation.run_simple(*args, **kwargs)
File "/usr/local/lib/python3.7/site-packages/breezy/cleanup.py", line 137, in run_simple
self.cleanups, self.func, *args, **kwargs)
File "/usr/local/lib/python3.7/site-packages/breezy/cleanup.py", line 166, in _do_with_cleanups
result = func(*args, **kwargs)
File "/usr/local/lib/python3.7/site-packages/breezy/builtins.py", line 4854, in run
self._revert_tree_to_revision(tree, revision, file_list, no_backup)
File "/usr/local/lib/python3.7/site-packages/breezy/builtins.py", line 4860, in _revert_tree_to_revision
report_changes=True)
File "/usr/local/lib/python3.7/site-packages/breezy/workingtree.py", line 1048, in revert
report_changes)
File "/usr/local/lib/python3.7/site-packages/breezy/transform.py", line 2861, in revert
delta.report_changes(tt.iter_changes(), change_reporter)
File "/usr/local/lib/python3.7/site-packages/breezy/transform.py", line 988, in iter_changes
self._from_file_data(from_trans_id, from_versioned, from_path)
File "/usr/local/lib/python3.7/site-packages/breezy/transform.py", line 909, in _from_file_data
specific_files=[from_path]))[1]
StopIteration
Yep, this is the same repo that I can't run 'brz revert' on, so I keep pulling and causing more conflicts, but can then branch from it fine.
> git fsck 697ff85e12c9581 514b11e41f 2c09ec2d70b78e7 fedcc9dc96 5d5fc3023637c8f 9df0a0e6c5 871e8b717bf35b6 bea24a685e fcfab9af0d9cbac f0866e101c e55ce191e659667 57fe0907e8 a90a898bcc6d83c 5562a4603d 042d1c834674ebc f32320341b 7170f44b728379e 784fef3b0c 8bdf7ba950156ec 4b0137c42d 334a9e5639b857d 8e5bc47f68 cd98efa5133d851 6a6043a0a9 352cbe38ff32f9a 216f4511be f212808fce38f17 01b8fc0c76 51b67c367ed77dd aeddfc5e82 c1efa4f5e7230df 23b3cdb945 58a2cca42017870 11578bffc5 15e2bbca2fc91ab 60c756ba5d b891adabad089b5 3727e752dc b10b330c8064665 328fca6d8f 71d8b7d4bcddac9 c40692af8b 249150fd69dd50f 0e3de03293 cdf35857691a653 9cafd6fff8 7f6ee7f3145035f 176a7bbf4d 4e8a847d085da43 b4ba011622 2c2ca07da8b9ed6 250b2f86fc 94a0ceb0c6736ba cf91df1165 db1386d650d8379 18ffd4d83b 90176e4f41e2e19 d3d4504098 9dce2c098af9673 e8c22a5c44 e31edb2549ad9fa 89939e2da5 55066a58c033de3 346339dd43 c066ccf7c455a8a a2d95b2de6 35c9ec57e26ec05 609e698c28 64d848ef31656a5 b02376b807 1992a931f33a5b8 4e90e2fcac 1154b925ab58f77 c3db755e64 edcc168eb850580 0c5a727ee2 faa8c8ddb07f59c 5d2ec7267d ca7a555ed6371f0 9ddcdaddbf 9052bef0c31ccc4 6e3c3e8a53 13f5853daa377d3 c67d47a82d
Checking object directories: 100% (256/256), done.
Checking objects: 100% (32548/32548), done.
dangling blob 8e1182f883ea4e3
dangling blob b91e0ee1ee24ce0
dangling blob 4027c81f19808e5
dangling blob 4f28c26ad2f2a22
dangling blob 3939b42848253ff
dangling tree f33c8ef535aec72
dangling blob 1c3f10aeefe3df7
dangling blob 074b249f77df18a
dangling blob 805190d406050db
dangling blob 355200c32de40d9
dangling blob 815cc4c1cd411b4
dangling tree da66122f1b1a410
dangling tree 1679b26360b963d
dangling tree 2a89968f712b8cf
dangling tree 01b73ed8e49065b
dangling blob e5bbf4691847eb5
dangling tree 16c3cccb7573fd7
dangling blob 5cf7303e6d2a1d8
dangling blob 3e0c8d88af336fa
dangling blob be0c13b1527218b
dangling blob 1b0e01822fcbb02
dangling blob f00ffff92736203
dangling blob f71485a1eef926f
dangling blob 7c18d54ce764467
dangling blob 8125f19347c4f72
dangling blob bb2c8b7c7f6904a
dangling blob 2d47a50a91fba53
dangling tree 1962d3ed5cf985c
dangling blob dc692744e473121
dangling tree 6e6b793d075e286
dangling tree 997d19e80a8b648
dangling blob 93ab4d24eef8749
dangling blob edb84fa9468e561
dangling tree f9c9819601cea42
dangling blob 78d1f3dd4308d51
dangling blob 2ed2134a4091b69
dangling tree 71d2550007fd881
dangling tree efd56f39765bd8f
dangling tree 4fd875b82b0b4c7
dangling tree a6d805a4dcde5ba
dangling blob 0dda3f173b53f33
dangling blob 67dae9db9cf0f5d
After running that, and updating to 3.0.2, creating a branch is working again. However, revert is still failing (I think that bug was marked as fixed):
> brz revert
brz: ERROR: StopIteration:
Traceback (most recent call last): lib/python3. 7/site- packages/ breezy/ commands. py", line 1016, in exception_ to_return_ code lib/python3. 7/site- packages/ breezy/ commands. py", line 1202, in run_bzr lib/python3. 7/site- packages/ breezy/ commands. py", line 759, in run_argv_aliases **all_cmd_ args) lib/python3. 7/site- packages/ breezy/ commands. py", line 784, in run .run_simple( *args, **kwargs) lib/python3. 7/site- packages/ breezy/ cleanup. py", line 137, in run_simple lib/python3. 7/site- packages/ breezy/ cleanup. py", line 166, in _do_with_cleanups lib/python3. 7/site- packages/ breezy/ builtins. py", line 4854, in run _revert_ tree_to_ revision( tree, revision, file_list, no_backup) lib/python3. 7/site- packages/ breezy/ builtins. py", line 4860, in _revert_ tree_to_ revision changes= True) lib/python3. 7/site- packages/ breezy/ workingtree. py", line 1048, in revert lib/python3. 7/site- packages/ breezy/ transform. py", line 2861, in revert report_ changes( tt.iter_ changes( ), change_reporter) lib/python3. 7/site- packages/ breezy/ transform. py", line 988, in iter_changes _from_file_ data(from_ trans_id, from_versioned, from_path) lib/python3. 7/site- packages/ breezy/ transform. py", line 909, in _from_file_data files=[ from_path] ))[1]
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.2 on python 3.7.4 (Darwin- 18.7.0- x86_64- i386-64bit) local/bin/ brz', 'revert'] [3.0.2] , changelog_ merge[3. 0.2], ews[3.0. 2], cvs[3.0.2], darcs[3.0.2], email[3.0.2], 3.0.2], launchpad[3.0.2], mtn[3.0.2], credential_ store[3. 0.2], news_merge[3.0.2], po_merge[3.0.2], fmt[3.0. 2]
arguments: ['/usr/
plugins: bash_completion
commitfromn
fastimport[
netrc_
propose[3.0.2], repodebug[3.0.2], stats[3.0.2], upload[3.0.2],
weave_
encoding: 'utf-8', fsenc: 'utf-8', lang: 'en_GB.UTF-8'