Mercurial Mercurial > hg-stable / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: glob out exception type for directory collision stable
authorMatt Mackall <mpm@selenic.com>
Thu, 25 Jul 2013 02:44:27 -0500
branchstable
changeset 19498 3ac1735a2265
parent 19497 e012a20061ed
child 19499 81318ca090a2
tests: glob out exception type for directory collision Got three different results on buildbot.
tests/test-merge1.t file | annotate | diff | comparison | revisions 
--- a/tests/test-merge1.t	Thu Jul 25 02:34:09 2013 -0500
+++ b/tests/test-merge1.t	Thu Jul 25 02:44:27 2013 -0500
@@ -28,7 +28,7 @@
 
   $ mkdir b
   $ hg up
-  abort: Is a directory: '$TESTTMP/t/b'
+  abort: *: '$TESTTMP/t/b' (glob)
   [255]
   $ hg ci
   abort: last update was interrupted
hg-stable