Private bug reported: Binary package hint: bzr
This is a Sun/MySQL - Canonical escalation imported into Launchpad by the Canonical Support Team (internal case 3929). Original escalation: 02/11/2009 12:49 PM EST Hello, here is a case of --weave merging wrongly. Take mysql-maria from https://code.launchpad.net/~mysql/mysql-server/mysql-maria at revision-id:[email protected] . Take mysql-5.1 from https://code.launchpad.net/~mysql/mysql-server/mysql-5.1 at revision-id:[email protected] . Do cd mysql-maria bzr merge --weave ../mysql-5.1 File mysys/my_getopt.c has no conflict, look at function init_one_value() inside it, do you see that there are two occurences of "case GET_UINT:" in the "switch()"? This is a wrong automerge. The same merge but with the default algorithm ("bzr merge ../mysql-5.1") gives a conflict in this region, which is ok. Note that this is not a criss-cross merge so I personally use merge3 for this merge (it gives me a base, which is better), but some colleagues always use --weave because they want to routinely use one single "good enough" algorithm. I know each algorithms has its unavoidable, unfixable design pitfalls, but I would like to ask you to check if it's really the case here or if it's rather a bug which could be fixed. Thanks! Bazaar (bzr) 1.12dev from bzr checkout /home/mysql_src/logiciels/bzr_versions/dev revision: 3997 revid: [email protected] branch nick: dev Python interpreter: /usr/bin/python 2.5 ** Affects: bzr (Ubuntu) Importance: Undecided Status: New ** Visibility changed to: Private -- 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 [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
