Fix a bad BitKeeper dependency structure for the "funcs_2" suite:
The files below "mysql-test/suite/funcs_2" in version 5.1 did not depend on the equivalent ones in 5.0, probably because they had been checked in independent of each other in both versions. Foreach file F in the suite that has a "deleted" counterpart D, use bk rm $F bk mv $D $F bk edit $F to get those files into the 5.1 suite that (for BK) depend on 5.0. There is only one file whose contents differs between 5.0 and 5.1, restore its current 5.1 contents: mysql-test/suite/funcs_2/r/ndb_charset.result BitKeeper/deleted/.del-charset_master.test~3ac6827798431a7: Delete: mysql-test/suite/funcs_2/charset/charset_master.test mysql-test/suite/funcs_2/charset/charset_master.test: Rename: BitKeeper/deleted/.del-charset_master.test -> mysql-test/suite/funcs_2/charset/charset_master.test BitKeeper/deleted/.del-charset_utf8.txt~c8409ddc3d216d4: Delete: mysql-test/suite/funcs_2/data/charset_utf8.txt BitKeeper/deleted/.del-check_charset.inc~1328722ebe51ab2b: Delete: mysql-test/suite/funcs_2/include/check_charset.inc mysql-test/suite/funcs_2/data/charset_utf8.txt: Rename: BitKeeper/deleted/.del-charset_utf8.txt -> mysql-test/suite/funcs_2/data/charset_utf8.txt mysql-test/suite/funcs_2/include/check_charset.inc: Rename: BitKeeper/deleted/.del-check_charset.inc -> mysql-test/suite/funcs_2/include/check_charset.inc BitKeeper/deleted/.del-check_charset_ucs2.inc~fbcdbb34f38ce9f1: Delete: mysql-test/suite/funcs_2/include/check_charset_ucs2.inc BitKeeper/deleted/.del-check_charset_utf8.inc~703a0b77d86f514e: Delete: mysql-test/suite/funcs_2/include/check_charset_utf8.inc BitKeeper/deleted/.del-gen_charset_utf8.pl~ff00332572f0f0b6: Delete: mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl mysql-test/suite/funcs_2/include/check_charset_ucs2.inc: Rename: BitKeeper/deleted/.del-check_charset_ucs2.inc -> mysql-test/suite/funcs_2/include/check_charset_ucs2.inc mysql-test/suite/funcs_2/include/check_charset_utf8.inc: Rename: BitKeeper/deleted/.del-check_charset_utf8.inc -> mysql-test/suite/funcs_2/include/check_charset_utf8.inc BitKeeper/deleted/.del-innodb_charset.result~5a9b45c455263e16: Delete: mysql-test/suite/funcs_2/r/innodb_charset.result BitKeeper/deleted/.del-memory_charset.result~3e27ebf0471b3472: Delete: mysql-test/suite/funcs_2/r/memory_charset.result mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl: Rename: BitKeeper/deleted/.del-gen_charset_utf8.pl -> mysql-test/suite/funcs_2/lib/gen_charset_utf8.pl mysql-test/suite/funcs_2/r/innodb_charset.result: Rename: BitKeeper/deleted/.del-innodb_charset.result -> mysql-test/suite/funcs_2/r/innodb_charset.result BitKeeper/deleted/.del-myisam_charset.result~e86d46123a579771: Delete: mysql-test/suite/funcs_2/r/myisam_charset.result BitKeeper/deleted/.del-ndb_charset.result~37be292ee7801689: Delete: mysql-test/suite/funcs_2/r/ndb_charset.result mysql-test/suite/funcs_2/r/memory_charset.result: Rename: BitKeeper/deleted/.del-memory_charset.result -> mysql-test/suite/funcs_2/r/memory_charset.result mysql-test/suite/funcs_2/r/myisam_charset.result: Rename: BitKeeper/deleted/.del-myisam_charset.result -> mysql-test/suite/funcs_2/r/myisam_charset.result BitKeeper/deleted/.del-innodb_charset.test~4555b7e4a5caa39: Delete: mysql-test/suite/funcs_2/t/innodb_charset.test BitKeeper/deleted/.del-memory_charset.test~4f055ebb453f58fd: Delete: mysql-test/suite/funcs_2/t/memory_charset.test BitKeeper/deleted/.del-myisam_charset.test~f859c5b56700de58: Delete: mysql-test/suite/funcs_2/t/myisam_charset.test mysql-test/suite/funcs_2/t/innodb_charset.test: Rename: BitKeeper/deleted/.del-innodb_charset.test -> mysql-test/suite/funcs_2/t/innodb_charset.test mysql-test/suite/funcs_2/t/memory_charset.test: Rename: BitKeeper/deleted/.del-memory_charset.test -> mysql-test/suite/funcs_2/t/memory_charset.test mysql-test/suite/funcs_2/t/myisam_charset.test: Rename: BitKeeper/deleted/.del-myisam_charset.test -> mysql-test/suite/funcs_2/t/myisam_charset.test BitKeeper/deleted/.del-ndb_charset.test~354cbaeb1bc2f75d: Delete: mysql-test/suite/funcs_2/t/ndb_charset.test BitKeeper/deleted/.del-readme.txt~e8399f1a3f34d433: Delete: mysql-test/suite/funcs_2/readme.txt mysql-test/suite/funcs_2/readme.txt: Rename: BitKeeper/deleted/.del-readme.txt~2 -> mysql-test/suite/funcs_2/readme.txt mysql-test/suite/funcs_2/t/ndb_charset.test: Rename: BitKeeper/deleted/.del-ndb_charset.test -> mysql-test/suite/funcs_2/t/ndb_charset.test mysql-test/suite/funcs_2/r/ndb_charset.result: Fix a bad BitKeeper dependency structure for the "funcs_2" suite: Restore the 5.1 contents into the 5.0-dependent file.
Showing
Please register or sign in to comment