# # # patch "ChangeLog" # from [aed8e136cebbbb9376bc11f5ebedf747f57f3b7b] # to [949ae4e24460622ec5c161f345aacae7428b81c0] # # patch "tests/import/__driver__.lua" # from [c661552cff943671d6b3dac78abbe7e906aa45de] # to [ef5c31f1013a6d102e7a9a3d783537f5c4d414f2] # ============================================================ --- ChangeLog aed8e136cebbbb9376bc11f5ebedf747f57f3b7b +++ ChangeLog 949ae4e24460622ec5c161f345aacae7428b81c0 @@ -1,5 +1,9 @@ 2006-12-01 Richard Levitte + * tests/import/__driver__.lua: Test using --message-file. + +2006-12-01 Richard Levitte + * cmd_ws_commit.cc (CMD_NO_WORKSPACE(import)): Add the usual restriction options, as well as --author and --date. * tests/import/__driver__.lua: Test the restrictions a bit. ============================================================ --- tests/import/__driver__.lua c661552cff943671d6b3dac78abbe7e906aa45de +++ tests/import/__driver__.lua ef5c31f1013a6d102e7a9a3d783537f5c4d414f2 @@ -38,9 +38,10 @@ writefile("importdir/importmesecond", "v ------------------------------------------------------------------------------ -- Third attempt, import something with an added file. writefile("importdir/importmesecond", "version 0 of second test file\n") +writefile("message", "Import three, an added file") check(mtn("import", "importdir", - "--message", "Import three, an added file", + "--message-file", "message", "--branch", "importbranch"), 0, false, false) check(mtn("checkout", "exportdir3", "--branch", "importbranch"),