changeset 1581 | db10b7114de0 |
parent 981 | 4f81068ed8cd |
child 1674 | dee55c4a4963 |
--- a/tests/test-up-local-change Wed Dec 14 22:12:18 2005 -0600 +++ b/tests/test-up-local-change Wed Dec 14 22:19:03 2005 -0600 @@ -25,7 +25,8 @@ 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/" \