On 9/15/17 8:11 PM, Augie Fackler wrote:
# HG changeset patch
# User Augie Fackler <au...@google.com>
# Date 1505502693 14400
# Fri Sep 15 15:11:33 2017 -0400
# Node ID 042b6de785af1dd5a65c4caaaac7202d8a1004ab
# Parent 99a25fd51eee06baf00117114f84b630dd75f15e
tests: fix test-uncommit.t to not rely on GNU rm's flags behavior
FreeBSD rm(1) was failing thus:
--- test-uncommit.t
+++ test-uncommit.t.err
@@ -299,6 +299,9 @@
$ cd ..
$ rm repo1 -rf
+ rm: repo1: is a directory
+ rm: -rf: No such file or directory
+ [1]
Testing uncommit while merge
diff --git a/tests/test-uncommit.t b/tests/test-uncommit.t
--- a/tests/test-uncommit.t
+++ b/tests/test-uncommit.t
@@ -298,7 +298,7 @@ Uncommit leaving an empty changeset
A Q
$ cd ..
- $ rm repo1 -rf
+ $ rm -rf repo1
Testing uncommit while merge
Patch LGTM
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel