Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change @ 2065:2ff37e3bf780

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
2064:547ede0123a2 2065:2ff37e3bf780
53 hg --debug up -m || echo failed 53 hg --debug up -m || echo failed
54 hg --debug up -f -m 54 hg --debug up -f -m
55 hg parents 55 hg parents
56 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ 56 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
57 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" 57 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
58
59 # test a local add
60 cd ..
61 hg init a
62 hg init b
63 echo a > a/a
64 echo a > b/a
65 hg --cwd a commit -A -m a
66 cd b
67 hg add a
68 hg pull -u ../a
69 hg st