# # # patch "tests/diff_patch_drop/__driver__.lua" # from [088c8ba2bdf2854861fc6c67eae30fb674886bd9] # to [7169de5155c5b68d837d66271cc09c446af8a4f1] # ============================================================ --- tests/diff_patch_drop/__driver__.lua 088c8ba2bdf2854861fc6c67eae30fb674886bd9 +++ tests/diff_patch_drop/__driver__.lua 7169de5155c5b68d837d66271cc09c446af8a4f1 @@ -24,7 +24,15 @@ copy("diff", "stdin") -- but it is a little aggressive and removes the dir too! copy("diff", "stdin") -check({"patch", "-p0"}, 0, false, false, true) +-- patch from openBSD and possibly other BSDs as well +-- does not automatically drop empty files / directories, see +-- http://article.gmane.org/gmane.comp.version-control.monotone.devel/17597 +if string.match(ostype, "BSD") then + check({"patch", "-p0", "-E"}, 0, false, false, true) +else + check({"patch", "-p0"}, 0, false, false, true) +end + check(not exists("dir/file")) check(not exists("dir"))