Kouhei Sutou
null+****@clear*****
Fri Oct 11 11:17:28 JST 2013
Kouhei Sutou 2013-10-11 11:17:28 +0900 (Fri, 11 Oct 2013) New Revision: c4a4e749b21f01673866fd71bba84ce006915116 https://github.com/mroonga/mariadb-sync/commit/c4a4e749b21f01673866fd71bba84ce006915116 Message: Clean before merge It may conflict without clean. Modified files: sync.sh Modified: sync.sh (+1 -0) =================================================================== --- sync.sh 2013-10-11 11:16:42 +0900 (5bc262f) +++ sync.sh 2013-10-11 11:17:28 +0900 (b3b3ea0) @@ -55,6 +55,7 @@ merge_mariadb() bzr pull cd "${mroonga_branch_dir}" + BUILD/cleanup bzr merge ../${merge_from} bzr commit -m "Merge from ${merge_from}" || true } -------------- next part -------------- HTML����������������������������...下载
