Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-up-local-change @ 1581:db10b7114de0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
abort when merging two heads and repository has local changes
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 14 Dec 2005 22:19:03 -0600
parents 4f81068ed8cd
children dee55c4a4963
comparison
equal deleted inserted replaced
1580:4737b36e324e 1581:db10b7114de0
23 23
24 cd ../r2 24 cd ../r2
25 hg -q pull ../r1 25 hg -q pull ../r1
26 hg status 26 hg status
27 hg --debug up 27 hg --debug up
28 hg --debug up -m 28 hg --debug up -m || echo failed
29 hg --debug up -f -m
29 hg parents 30 hg parents
30 hg -v history 31 hg -v history
31 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ 32 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \
32 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" 33 -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/"
33 34