Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge2 @ 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 | ec85f9e6f3b1 8f5637f0a0c0 0902ffece4b4 |
| rev | line source |
|---|---|
| 409 | 1 #!/bin/sh -x |
| 2 | |
| 3 mkdir t | |
| 4 cd t | |
| 5 hg init | |
| 6 echo This is file a1 > a | |
| 7 hg add a | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
8 hg commit -m "commit #0" -d "0 0" |
| 409 | 9 echo This is file b1 > b |
| 10 hg add b | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
11 hg commit -m "commit #1" -d "0 0" |
| 409 | 12 rm b |
| 13 hg update 0 | |
| 14 echo This is file b2 > b | |
| 15 hg add b | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
16 hg commit -m "commit #2" -d "0 0" |
| 409 | 17 cd ..; /bin/rm -rf t |
| 18 | |
| 19 mkdir t | |
| 20 cd t | |
| 21 hg init | |
| 22 echo This is file a1 > a | |
| 23 hg add a | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
24 hg commit -m "commit #0" -d "0 0" |
| 409 | 25 echo This is file b1 > b |
| 26 hg add b | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
27 hg commit -m "commit #1" -d "0 0" |
| 409 | 28 rm b |
| 29 hg update 0 | |
| 30 echo This is file b2 > b | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
31 hg commit -A -m "commit #2" -d "0 0" |
| 409 | 32 cd ..; /bin/rm -rf t |
| 33 | |
| 34 mkdir t | |
| 35 cd t | |
| 36 hg init | |
| 37 echo This is file a1 > a | |
| 38 hg add a | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
39 hg commit -m "commit #0" -d "0 0" |
| 409 | 40 echo This is file b1 > b |
| 41 hg add b | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
42 hg commit -m "commit #1" -d "0 0" |
| 409 | 43 rm b |
| 44 hg remove b | |
| 45 hg update 0 | |
| 46 echo This is file b2 > b | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
47 hg commit -A -m "commit #2" -d "0 0" |
| 409 | 48 cd ..; /bin/rm -rf t |