Mercurial > hg > gitweb
diff tests/test-up-local-change @ 2283:e506c14382fd
deprecate 'update -m'. use 'merge' instead.
| author | Vadim Gelfer <vadim.gelfer@gmail.com> |
|---|---|
| date | Sun, 14 May 2006 21:07:34 -0700 |
| parents | 2ff37e3bf780 |
| children | 096f1c73cdc3 |
line wrap: on
line diff
--- a/tests/test-up-local-change Sun May 14 17:37:34 2006 -0700 +++ b/tests/test-up-local-change Sun May 14 21:07:34 2006 -0700 @@ -29,7 +29,7 @@ hg parents hg --debug up 0 hg parents -hg --debug up -m || echo failed +hg --debug merge || echo failed hg parents hg --debug up hg parents @@ -50,8 +50,8 @@ hg status hg parents hg --debug up || echo failed -hg --debug up -m || echo failed -hg --debug up -f -m +hg --debug merge || echo failed +hg --debug merge -f hg parents hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"