SRU Verification: I ran the script above (thanks very much) on maverick's 2.2.0 and it failed, though not in the exact same way:
% sh 646961-repro.sh Created a standalone tree (format: 2a) adding file1 Committing to: /home/mbp/tmp/tmp/ added file1 Committed revision 1. Branched 1 revision(s). Committing to: /home/mbp/tmp/tmp/ modified file1 Committed revision 2. Committing to: /home/mbp/tmp/tmp2/ modified file1 Committed revision 2. M file1 Text conflict in file1 1 conflicts encountered. bzr: ERROR: Tree transform is malformed [('duplicate', None, 'new-1', None)] sh 646961-repro.sh 1.13s user 0.25s system 81% cpu 1.687 total with the SRU's 2.2.4-0ubuntu1, I get a clean error: % sh 646961-repro.sh Created a standalone tree (format: 2a) adding file1 Committing to: /home/mbp/tmp/tmp/ added file1 Committed revision 1. Branched 1 revision(s). Committing to: /home/mbp/tmp/tmp/ modified file1 Committed revision 2. Committing to: /home/mbp/tmp/tmp2/ modified file1 Committed revision 2. M file1 Text conflict in file1 1 conflicts encountered. Per vila's comment #3, this is not completely implemented yet, but it does address the particular bug described here. Therefore, verification complete. ** Attachment added: "646961-repro.sh" https://bugs.launchpad.net/bzr/+bug/646961/+attachment/2078443/+files/646961-repro.sh ** Tags added: verification-ok ** Tags removed: verification-needed -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/646961 Title: resolve --take-other produces AttributeError -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs