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