See <http://hudson.drizzle.org/job/drizzle-trunk-ubuntu-merge/140/>
------------------------------------------ Started by upstream project "drizzle-trunk-source" build number 727 Building remotely on slicehost-lucid64 $ bzr revision-info -d <http://hudson.drizzle.org/job/drizzle-trunk-ubuntu-merge/ws/> Cleaning workspace... $ bzr branch lp:~drizzle-developers/ubuntu/natty/drizzle/nightly <http://hudson.drizzle.org/job/drizzle-trunk-ubuntu-merge/ws/> Branched 1372 revision(s). $ bzr revision-info -d <http://hudson.drizzle.org/job/drizzle-trunk-ubuntu-merge/ws/> [drizzle-trunk-ubuntu-merge] $ bzr log -v -r revid:[email protected]:hud...@lucid64-20110111182710-fe4r9lpi7t8184uq --long --show-ids Getting local revision... $ bzr revision-info -d <http://hudson.drizzle.org/job/drizzle-trunk-ubuntu-merge/ws/> RevisionState revno:1372 revid:hud...@lucid64-20110111182710-fe4r9lpi7t8184uq [drizzle-trunk-ubuntu-merge] $ /bin/sh -xe /tmp/hudson3693296496610628426.sh + bzr merge lp:drizzle M drizzled/constrained_value.h M drizzled/set_var.cc M drizzled/set_var.h M drizzled/sql_yacc.yy M drizzled/statement/alter_table.cc 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
