Mercurial > hg
annotate tests/test-merge2.out @ 762:312b4a10d862
Changed more occurances of 'text' to 'message'.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Fri, 22 Jul 2005 16:26:46 +0100 |
| parents | 7e4843b7efd2 |
| children | 61ed30e82b27 |
| rev | line source |
|---|---|
| 409 | 1 + mkdir t |
| 2 + cd t | |
| 3 + hg init | |
| 4 + echo This is file a1 | |
| 5 + hg add a | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
6 + hg commit -m 'commit #0' -d '0 0' |
| 409 | 7 + echo This is file b1 |
| 8 + hg add b | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
9 + hg commit -m 'commit #1' -d '0 0' |
| 409 | 10 + rm b |
| 11 + hg update 0 | |
| 12 + echo This is file b2 | |
| 13 + hg add b | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
14 + hg commit -m 'commit #2' -d '0 0' |
| 409 | 15 + cd .. |
| 16 + /bin/rm -rf t | |
| 17 + mkdir t | |
| 18 + cd t | |
| 19 + hg init | |
| 20 + echo This is file a1 | |
| 21 + hg add a | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
22 + hg commit -m 'commit #0' -d '0 0' |
| 409 | 23 + echo This is file b1 |
| 24 + hg add b | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
25 + hg commit -m 'commit #1' -d '0 0' |
| 409 | 26 + rm b |
| 27 + hg update 0 | |
| 28 + echo This is file b2 | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
29 + hg commit -A -m 'commit #2' -d '0 0' |
| 409 | 30 + cd .. |
| 31 + /bin/rm -rf t | |
| 32 + mkdir t | |
| 33 + cd t | |
| 34 + hg init | |
| 35 + echo This is file a1 | |
| 36 + hg add a | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
37 + hg commit -m 'commit #0' -d '0 0' |
| 409 | 38 + echo This is file b1 |
| 39 + hg add b | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
40 + hg commit -m 'commit #1' -d '0 0' |
| 409 | 41 + rm b |
| 42 + hg remove b | |
| 43 + hg update 0 | |
| 44 + echo This is file b2 | |
|
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
409
diff
changeset
|
45 + hg commit -A -m 'commit #2' -d '0 0' |
| 409 | 46 + cd .. |
| 47 + /bin/rm -rf t |