ERROR: Tree transform is malformed [('versioning no contents', 'new-3')]
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
High
|
Vincent Ladeuil | ||
2.4 |
Fix Released
|
High
|
Vincent Ladeuil |
Bug Description
Hi,
Running this command after a merge which generated 51 conflicts :
bzr resolve --all --take-other
I got :
bzr: ERROR: Tree transform is malformed [('versioning no contents', 'new-3')]
Here is the .bzr.log traceback :
lun. 2011-10-24 09:53:11 +0200
0.050 bazaar version: 2.4.1
0.050 bzr arguments: [u'resolve', u'--all', u'--take-other']
0.066 looking for plugins in /home/thibaut/
0.067 looking for plugins in /usr/lib/
0.091 encoding stdout as sys.stdout encoding 'UTF-8'
0.109 opening working tree '/home/
0.356 Transferred: 0kB (0.0kB/s r:0kB w:0kB)
0.358 Traceback (most recent call last):
File "/usr/lib/
return the_callable(*args, **kwargs)
File "/usr/lib/
ret = run(*run_argv)
File "/usr/lib/
return self.run(
File "/usr/lib/
return self._operation
File "/usr/lib/
self.cleanups, self.func, *args, **kwargs)
File "/usr/lib/
result = func(*args, **kwargs)
File "/usr/lib/
before, after = resolve(tree, file_list, action=action)
File "/usr/lib/
conflict.
File "/usr/lib/
meth(tree)
File "/usr/lib/
self.
File "/usr/lib/
op.
File "/usr/lib/
self.cleanups, self.func, *args, **kwargs)
File "/usr/lib/
result = func(*args, **kwargs)
File "/usr/lib/
tt.apply()
File "/usr/lib/
self.
File "/usr/lib/
raise MalformedTransf
MalformedTransform: Tree transform is malformed [('duplicate', 'new-2', 'new-204', u'crm.py')]
0.358 return code 3
Note : All the conflicts are not fusion conflicts. I mean, there is no "<<<" in the file, I don't know why they are marked as conflicts. We never edited any of the files marked as in conflicts.
Related branches
- Martin Packman (community): Approve
-
Diff: 280 lines (+107/-35)5 files modifiedbzrlib/errors.py (+1/-1)
bzrlib/merge.py (+73/-32)
bzrlib/tests/test_conflicts.py (+20/-1)
bzrlib/transform.py (+1/-1)
doc/en/release-notes/bzr-2.4.txt (+12/-0)
Changed in bzr: | |
milestone: | none → 2.5b3 |
Changed in bzr: | |
status: | In Progress → Fix Released |
I join a file containing the result of `bzr st`.