Mercurial > hg-stable
diff tests/test-up-local-change @ 2065:2ff37e3bf780
fix update when a locally added file match the target revision
the dirstate entry for the added file wasn't updated.
fix issue207
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 14 Apr 2006 00:41:50 +0200 |
parents | 7544700fd931 |
children | e506c14382fd |
line wrap: on
line diff
--- a/tests/test-up-local-change Thu Apr 13 13:46:56 2006 -0700 +++ b/tests/test-up-local-change Fri Apr 14 00:41:50 2006 +0200 @@ -55,3 +55,15 @@ hg parents hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" + +# test a local add +cd .. +hg init a +hg init b +echo a > a/a +echo a > b/a +hg --cwd a commit -A -m a +cd b +hg add a +hg pull -u ../a +hg st