| 2010-12-09 16:19:13 |
Vincent Ladeuil |
description |
When trying to merge between lp:nux (rev 151) and lp:~unity-team/nux/packaging (rev 141), I get a lot of conflicts.
To resolve that, I wanted to:
bzr resolve --all --take-other
bzr: ERROR: Tree transform is malformed [('duplicate id', 'new-74', 'new-1')]
getting that with bzr version in natty (2.3b3) and trunk:
$ ./bzr --version
Bazaar (bzr) 2.3.0dev5
from bzr checkout /home/didrocks/sandbox/bzr
revision: 5563
revid: pqm@pqm.ubuntu.com-20101208085718-krp2xe9v3i446gpv
branch nick: bzr
Python interpreter: /usr/bin/python 2.6.6
Python standard library: /usr/lib/python2.6
Platform: Linux-2.6.37-8-generic-i686-with-Ubuntu-11.04-natty
bzrlib: /home/didrocks/sandbox/bzr/bzrlib
Bazaar configuration: /home/didrocks/.bazaar
Bazaar log file: /home/didrocks/.bzr.log |
When trying to merge between lp:nux (rev 151) and lp:~unity-team/nux/packaging (rev 141), I get a lot of conflicts.
To resolve that, I wanted to:
bzr resolve --take-other
bzr: ERROR: Tree transform is malformed [('duplicate id', 'new-74', 'new-1')]
getting that with bzr version in natty (2.3b3) and trunk:
$ ./bzr --version
Bazaar (bzr) 2.3.0dev5
from bzr checkout /home/didrocks/sandbox/bzr
revision: 5563
revid: pqm@pqm.ubuntu.com-20101208085718-krp2xe9v3i446gpv
branch nick: bzr
Python interpreter: /usr/bin/python 2.6.6
Python standard library: /usr/lib/python2.6
Platform: Linux-2.6.37-8-generic-i686-with-Ubuntu-11.04-natty
bzrlib: /home/didrocks/sandbox/bzr/bzrlib
Bazaar configuration: /home/didrocks/.bazaar
Bazaar log file: /home/didrocks/.bzr.log
|
|
