MalformedTransform in _prepare_revert_transform

[Craig Hewetson]

I ran into the following qbzr bug:
https://bugs.launchpad.net/qbzr/+bug/526933

After qadd inadvertantly added all my ignore files to the tree, I then went about reverting the changes and it failed with the following stacktrace:

0.042 bazaar version: 2.1.0
0.042 bzr arguments: [u'qadd']
0.058 looking for plugins in /home/craig/.bazaar/plugins
160.110 Traceback (most recent call last):
 File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 853, in exception_to_return_code
   return the_callable(*args, **kwargs)
 File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1055, in run_bzr
   ret = run(*run_argv)
 File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 661, in run_argv_aliases
   return self.run_direct(**all_cmd_args)
 File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 665, in run_direct
   return self._operation.run_simple(*args, **kwargs)
 File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 122, in run_simple
   self.cleanups, self.func, *args, **kwargs)
 File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 156, in _do_with_cleanups
   result = func(*args, **kwargs)
 File "/home/craig/.bazaar/plugins/qbzr/lib/commands.py", line 788, in run
   return run_subprocess_command(cmd, bencoded)
 File "/home/craig/.bazaar/plugins/qbzr/lib/subprocess.py", line 813, in run_subprocess_command
   return commands.run_bzr(argv)
 File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1055, in run_bzr
   ret = run(*run_argv)
 File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 661, in run_argv_aliases
   return self.run_direct(**all_cmd_args)
 File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 665, in run_direct
   return self._operation.run_simple(*args, **kwargs)
 File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 122, in run_simple
   self.cleanups, self.func, *args, **kwargs)
 File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 156, in _do_with_cleanups
   result = func(*args, **kwargs)
 File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 4153, in run
   self._revert_tree_to_revision(tree, revision, file_list, no_backup)
 File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 4161, in _revert_tree_to_revision
   report_changes=True)
 File "/usr/lib/python2.6/dist-packages/bzrlib/mutabletree.py", line 49, in tree_write_locked
   return unbound(self, *args, **kwargs)
 File "/usr/lib/python2.6/dist-packages/bzrlib/workingtree.py", line 2084, in revert
   report_changes)
 File "/usr/lib/python2.6/dist-packages/bzrlib/transform.py", line 2599, in revert
   working_tree, target_tree, tt, filenames, backups, pp)
 File "/usr/lib/python2.6/dist-packages/bzrlib/transform.py", line 2633, in _prepare_revert_transform
   lambda t, c: conflict_pass(t, c, target_tree))
 File "/usr/lib/python2.6/dist-packages/bzrlib/transform.py", line 2769, in resolve_conflicts
   raise MalformedTransform(conflicts=conflicts)
MalformedTransform: Tree transform is malformed [('missing parent', 'new-28908')]

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
To reproduce:
install qbzr 0.18.2 and run qadd on a tree with many ignored files. Add one or two files.
NOTE: all ignored files will be added.
Then run revert and you will get the above stack trace.

[Alexander Belchenko (bialix)]

Does plain revert (not qrevert) trigger this?

[Craig Hewetson (craighewetson-deactivatedaccount)]

I will have to investigate, note I didn't want to revert every thing so i
had to use qrevert. I will check ASAP