bzr resolve --take-other bzr: ERROR: Tree transform is malformed [('duplicate', None, 'new-1', None)]
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
High
|
Vincent Ladeuil |
Bug Description
Tue 2010-09-14 23:02:24 +0200
0.136 bazaar version: 2.2.0
0.137 bzr arguments: [u'resolve', u'--take-other']
0.165 looking for plugins in /home/chx/
0.249 looking for plugins in /usr/lib/
0.290 encoding stdout as sys.stdout encoding 'UTF-8'
0.374 opening working tree '/home/
0.513 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/
resolve(tree, file_list, action=action)
File "/usr/lib/
conflict.
File "/usr/lib/
meth(tree)
File "/usr/lib/
winner='other')
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', None, 'new-1', None)]
Bazaar (bzr) 2.2.0
Python interpreter: /usr/bin/python 2.6.5
Python standard library: /usr/lib/python2.6
Platform: Linux-2.
Related branches
- Vincent Ladeuil: Approve
-
Diff: 244 lines (+102/-56)7 files modifiedbzrlib/conflicts.py (+31/-0)
bzrlib/help_topics/en/conflict-types.txt (+15/-5)
bzrlib/tests/blackbox/test_resolve.py (+0/-45)
bzrlib/tests/test_conflicts.py (+44/-5)
bzrlib/transform.py (+1/-1)
doc/en/release-notes/bzr-2.3.txt (+5/-0)
doc/en/whats-new/whats-new-in-2.3.txt (+6/-0)
Changed in bzr: | |
status: | New → Confirmed |
importance: | Undecided → Medium |
tags: | added: conflicts |
Changed in bzr: | |
importance: | Medium → High |
Changed in bzr: | |
milestone: | none → 2.3b5 |
status: | In Progress → Fix Released |
mgz asked me to describe what happened. So this is a Drupal based site. Which means, I took a few months old lp:drupal took a few patches out of the Drupal issue queue and applied them. Now some of these are in the current lp:drupal but of course a bit evolved, some are not. So I checked out lp:drupal , reapplied our changes and wanted to merge back in lp:~examiner-dev/examiner/trunk and wanted to say, the newer core files are the correct ones and then what you see up has happened.