changeset 591 | eb46971fc57f |
parent 547 | 4fc63e22b1fe |
child 749 | 7e4843b7efd2 |
590:38d106db75bc | 591:eb46971fc57f |
---|---|
24 hg commit -t "2" -u test -d "0 0" |
24 hg commit -t "2" -u test -d "0 0" |
25 |
25 |
26 cd ../r2 |
26 cd ../r2 |
27 hg -q pull ../r1 |
27 hg -q pull ../r1 |
28 hg status |
28 hg status |
29 hg -d up |
29 hg --debug up |
30 hg -d up -m |
30 hg --debug up -m |
31 hg parents |
31 hg parents |
32 hg -v history |
32 hg -v history |
33 hg diff > ../d |
33 hg diff > ../d |
34 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d |
34 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d |
35 |
35 |