Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge2.out @ 921:1a51fa1b3513
show_changeset: -q shows short hash
author | mpm@selenic.com |
---|---|
date | Tue, 16 Aug 2005 15:50:42 -0800 |
parents | 0902ffece4b4 |
children | 5a034646e472 |
rev | line source |
---|---|
409 | 1 + hg init |
2 + hg add a | |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
767
diff
changeset
|
3 + hg commit -m commit #0 -d 0 0 |
409 | 4 + hg add b |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
767
diff
changeset
|
5 + hg commit -m commit #1 -d 0 0 |
409 | 6 + hg update 0 |
7 + hg add b | |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
767
diff
changeset
|
8 + hg commit -m commit #2 -d 0 0 |
409 | 9 + hg init |
10 + hg add a | |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
767
diff
changeset
|
11 + hg commit -m commit #0 -d 0 0 |
409 | 12 + hg add b |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
767
diff
changeset
|
13 + hg commit -m commit #1 -d 0 0 |
409 | 14 + hg update 0 |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
767
diff
changeset
|
15 + hg commit -A -m commit #2 -d 0 0 |
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
|
16 adding b |
409 | 17 + hg init |
18 + hg add a | |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
767
diff
changeset
|
19 + hg commit -m commit #0 -d 0 0 |
409 | 20 + hg add b |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
767
diff
changeset
|
21 + hg commit -m commit #1 -d 0 0 |
409 | 22 + hg remove b |
23 + hg update 0 | |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
767
diff
changeset
|
24 + hg commit -A -m commit #2 -d 0 0 |
767
61ed30e82b27
Update tests to match new addremove chattiness.
Bryan O'Sullivan <bos@serpentine.com>
parents:
749
diff
changeset
|
25 adding b |