Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-up-local-change @ 793:445970ccf57a
Merge with upstream
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Fri, 29 Jul 2005 06:43:21 +0100 |
parents | 7e4843b7efd2 6592c4f5cd4f |
children | ec85f9e6f3b1 |
comparison
equal
deleted
inserted
replaced
792:49ec802b4a16 | 793:445970ccf57a |
---|---|
11 hg clone . ../r2 | 11 hg clone . ../r2 |
12 cd ../r2 | 12 cd ../r2 |
13 hg up | 13 hg up |
14 echo abc > a | 14 echo abc > a |
15 hg diff > ../d | 15 hg diff > ../d |
16 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d | 16 sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d |
17 | 17 |
18 cd ../r1 | 18 cd ../r1 |
19 echo b > b | 19 echo b > b |
20 echo a2 > a | 20 echo a2 > a |
21 hg addremove | 21 hg addremove |
27 hg --debug up | 27 hg --debug up |
28 hg --debug up -m | 28 hg --debug up -m |
29 hg parents | 29 hg parents |
30 hg -v history | 30 hg -v history |
31 hg diff > ../d | 31 hg diff > ../d |
32 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d | 32 sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d |
33 | 33 |