Mercurial > hg
view tests/test-convert-bzr-merges @ 7493:518afef5e350
Fix Bugzilla integration to work with new Bugzilla 3.2.
Bugzilla 3.2 changes the type of all MySQL tables it uses from MyISAM
to InnoDB. MyISAM does not support transactions, and performs an implied
commit after each update. InnoDB does support transactions, and so
exposes a bug where changes to the Bugzilla database were not committed,
and so with 3.2 are lost when the database connection closes.
author | Jim Hague <jim.hague@acm.org> |
---|---|
date | Tue, 09 Dec 2008 09:58:13 +0000 |
parents | 9e6d6568bf7a |
children | d65671beee7f |
line wrap: on
line source
#!/bin/sh . "$TESTDIR/bzr-definitions" echo % test multiple merges at once mkdir test-multimerge cd test-multimerge bzr init -q source cd source echo content > file bzr add -q file bzr commit -q -m 'Initial add' cd .. bzr branch -q source source-branch1 cd source-branch1 echo morecontent >> file echo evenmorecontent > file-branch1 bzr add -q file-branch1 bzr commit -q -m 'Added branch1 file' cd ../source echo content > file-parent bzr add -q file-parent bzr commit -q -m 'Added parent file' cd .. bzr branch -q source source-branch2 cd source-branch2 echo somecontent > file-branch2 bzr add -q file-branch2 bzr commit -q -m 'Added brach2 file' cd ../source bzr merge -q ../source-branch1 bzr merge -q --force ../source-branch2 bzr commit -q -m 'Merged branches' cd .. hg convert --datesort source source-hg glog -R source-hg manifest source-hg tip