See <http://hudson.drizzle.org/job/drizzle-trunk-ubuntu-merge/128/>
------------------------------------------ Started by upstream project "drizzle-trunk-source" build number 716 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 1362 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-20110108065240-0yi4rzp5q3nqbr0x --long --show-ids Getting local revision... $ bzr revision-info -d <http://hudson.drizzle.org/job/drizzle-trunk-ubuntu-merge/ws/> RevisionState revno:1362 revid:hud...@lucid64-20110108065240-0yi4rzp5q3nqbr0x [drizzle-trunk-ubuntu-merge] $ /bin/sh -xe /tmp/hudson4704131985518777514.sh + bzr merge lp:drizzle +N drizzled/field/microtime.cc +N drizzled/field/microtime.h +N tests/suite/microtime_type/ +N tests/suite/microtime_type/r/ +N tests/suite/microtime_type/r/basic.result +N tests/suite/microtime_type/t/ +N tests/suite/microtime_type/t/basic.test M drizzled/common.h M drizzled/create_field.cc M drizzled/definition/table.cc M drizzled/definition/table.h M drizzled/display.cc M drizzled/field.cc M drizzled/field.h M drizzled/field/epoch.cc M drizzled/field/epoch.h M drizzled/field/str.cc M drizzled/field_conv.cc M drizzled/function/time/curdate.cc M drizzled/function/time/date_add_interval.cc M drizzled/function/time/now.cc M drizzled/function/time/now.h M drizzled/function/time/unix_timestamp.cc M drizzled/include.am M drizzled/item.cc M drizzled/join.cc M drizzled/message.cc M drizzled/message/statement_transform.cc M drizzled/message/table.proto M drizzled/session.h M drizzled/sql_load.cc M drizzled/sql_parse.cc M drizzled/sql_table.cc M drizzled/sql_yacc.yy M drizzled/statement/alter_table.cc M drizzled/table_proto_write.cc M drizzled/temporal.cc M drizzled/temporal.h M drizzled/type/time.h M plugin/innobase/handler/ha_innodb.cc M plugin/mysql_protocol/mysql_protocol.cc M tests/include.am M tests/r/func_time.result M tests/r/metadata.result M tests/r/show_check.result M unittests/micro_timestamp_test.cc Text conflict in tests/include.am 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
