Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-up-local-change @ 766:b444a7e053f1
Get addremove to use new walk code.
It is now more verbose than it used to be. If given file names, it
prints nothing, as before. But if given patterns or nothing, it prints
the names of the files it is operating on, to remove that air of mystery.
It also now operates at or below the current directory.
author | Bryan O'Sullivan <bos@serpentine.com> |
---|---|
date | Fri, 22 Jul 2005 19:45:48 -0800 |
parents | 7e4843b7efd2 |
children | 6592c4f5cd4f 445970ccf57a |
rev | line source |
---|---|
544
3d4d5f2aba9a
Remove bashisms and use /bin/sh instead of /bin/bash.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
485
diff
changeset
|
1 #!/bin/sh |
331 | 2 |
3 set -ex | |
4 mkdir r1 | |
5 cd r1 | |
6 hg init | |
7 echo a > a | |
8 hg addremove | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
9 hg commit -m "1" -d "0 0" |
331 | 10 |
485 | 11 hg clone . ../r2 |
12 cd ../r2 | |
331 | 13 hg up |
14 echo abc > a | |
332 | 15 hg diff > ../d |
16 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d | |
331 | 17 |
18 cd ../r1 | |
19 echo b > b | |
20 echo a2 > a | |
21 hg addremove | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
591
diff
changeset
|
22 hg commit -m "2" -d "0 0" |
331 | 23 |
24 cd ../r2 | |
25 hg -q pull ../r1 | |
26 hg status | |
591 | 27 hg --debug up |
28 hg --debug up -m | |
331 | 29 hg parents |
30 hg -v history | |
332 | 31 hg diff > ../d |
32 sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d | |
331 | 33 |