Mercurial > hg > pyhgsh

annotate tests/test-merge2.out @ 814:0902ffece4b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with BOS
author mpm@selenic.com
date Sat, 30 Jul 2005 09:00:14 -0800
parents 8f5637f0a0c0 61ed30e82b27
children 5a034646e472
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
409
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
1 + hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
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
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
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
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
6 + hg update 0
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
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
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
9 + hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
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
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
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
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
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
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
17 + hg init
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
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
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
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
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
22 + hg remove b
feadc9697b43 Pick up tests from previous patch
mpm@selenic.com
parents:
diff changeset
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