My initial feeling is that it is just a limitation of weave merging. I think if I boil down the details, it comes down to:
BASE TEXT a b c d e THIS TEXT a b /* with comment */ c d e OTHER TEXT a c d b X e Put in words, THIS changes a single line, while OTHER deletes the line, and creates a similar line later on in the file. I can reproduce the results with 3 commits and texts that exactly match the above. Note that if you only use a single line inbetween (just 'c', rather than 'cd'), then you get conflicts for both weave and merge3. Note that "bzr merge --lca" also has the same behavior as "bzr merge --weave". -- MYSQL/BZR P3: wrong automerge by --weave https://bugs.launchpad.net/bugs/328171 You received this bug notification because you are a member of Ubuntu Bugs, which is a direct subscriber. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
