See <http://hudson.drizzle.org/job/drizzle-trunk-debian-merge/342/>
------------------------------------------ Started by upstream project "drizzle-trunk-source" build number 726 Building remotely on Drizzle-orisndriz03 $ bzr revision-info -d <http://hudson.drizzle.org/job/drizzle-trunk-debian-merge/ws/> Cleaning workspace... $ bzr branch lp:~drizzle-developers/debian/sid/drizzle/nightly <http://hudson.drizzle.org/job/drizzle-trunk-debian-merge/ws/> Branched 1506 revision(s). $ bzr revision-info -d <http://hudson.drizzle.org/job/drizzle-trunk-debian-merge/ws/> [drizzle-trunk-debian-merge] $ bzr log -v -r revid:[email protected]:[email protected] --long --show-ids Getting local revision... $ bzr revision-info -d <http://hudson.drizzle.org/job/drizzle-trunk-debian-merge/ws/> RevisionState revno:1506 revid:[email protected] [drizzle-trunk-debian-merge] $ /bin/sh -xe /tmp/hudson1998004124385422748.sh + bzr merge lp:drizzle M drizzled/constrained_value.h M drizzled/set_var.cc M drizzled/set_var.h M drizzled/sys_var.cc M drizzled/sys_var.h M plugin/innobase/handler/ha_innodb.cc Text conflict in drizzled/sys_var.cc 1 conflicts encountered. _______________________________________________ Mailing list: https://launchpad.net/~drizzle-builds Post to : [email protected] Unsubscribe : https://launchpad.net/~drizzle-builds More help : https://help.launchpad.net/ListHelp
