equal
deleted
inserted
replaced
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 |