Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-up-local-change @ 1679:675ca845c2f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with upstream
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Thu, 15 Dec 2005 18:04:39 +0100
parents db10b7114de0
children dee55c4a4963
line wrap: on
line diff
--- a/tests/test-up-local-change
+++ b/tests/test-up-local-change
@@ -25,7 +25,8 @@ cd ../r2
 hg -q pull ../r1
 hg status
 hg --debug up
-hg --debug up -m
+hg --debug up -m || echo failed
+hg --debug up -f -m
 hg parents
 hg -v history
 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \