Bazaar

  1. Bug #40412
  2. Comment #16

Comment 16 for bug 40412

Revision history for this message
GuilhemBichot (guilhem-bichot) wrote : Re: show-base for weave merge

Get https://code.launchpad.net/~mysql/mysql-server/mysql-6.0-codebase-bugfixing, make two branches of it:
A at revid:<email address hidden>
B at revid:<email address hidden>
then do
cd B
yourbzr merge --weave ../A
Then notice that mysql-test/r/slave_allow_batching_basic.result and mysql-test/t/slave_allow_batching_basic.test are in "bzr conflicts --text" but have no BASE file.
I checked that I used your branch.