Mercurial > hg > mercurial-crew-with-dirclash
comparison 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 |
comparison
equal
deleted
inserted
replaced
2282:2efa636eb411 | 2283:e506c14382fd |
---|---|
27 hg parents | 27 hg parents |
28 hg --debug up | 28 hg --debug up |
29 hg parents | 29 hg parents |
30 hg --debug up 0 | 30 hg --debug up 0 |
31 hg parents | 31 hg parents |
32 hg --debug up -m || echo failed | 32 hg --debug merge || echo failed |
33 hg parents | 33 hg parents |
34 hg --debug up | 34 hg --debug up |
35 hg parents | 35 hg parents |
36 hg -v history | 36 hg -v history |
37 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ | 37 hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" \ |
48 cd ../r2 | 48 cd ../r2 |
49 hg -q pull ../r1 | 49 hg -q pull ../r1 |
50 hg status | 50 hg status |
51 hg parents | 51 hg parents |
52 hg --debug up || echo failed | 52 hg --debug up || echo failed |
53 hg --debug up -m || echo failed | 53 hg --debug merge || echo failed |
54 hg --debug up -f -m | 54 hg --debug merge -f |
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 | 58 |
59 # test a local add | 59 # test a local add |