Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-merge-revert2.out @ 899:aa5b726e9619
Add '-' support to the commit logfile option to read message from stdin.
author | mark.williamson@cl.cam.ac.uk |
---|---|
date | Sun, 14 Aug 2005 12:30:01 -0800 |
parents | 01215ad04283 |
children | 5a034646e472 |
rev | line source |
---|---|
792
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
1 + hg init |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
2 + hg add file1 file2 |
801
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
792
diff
changeset
|
3 + hg commit -m added file1 and file2 -d 0 0 -u user |
1f9ec150a476
Updated output of tests.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
792
diff
changeset
|
4 + hg commit -m changed file1 -d 0 0 -u user |
792
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
5 + hg -q log |
864
6225bd773c51
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
862
diff
changeset
|
6 1:f4d7a8c73d231bc078e2a5e791325e55e8a4c252 |
6225bd773c51
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
862
diff
changeset
|
7 0:232e179b3f294d467cfa66e1439bc5b0d44e4a93 |
792
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
8 + hg id |
864
6225bd773c51
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
862
diff
changeset
|
9 f4d7a8c73d23 tip |
792
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
10 + hg update -C 0 |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
11 + hg id |
864
6225bd773c51
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
862
diff
changeset
|
12 232e179b3f29 |
792
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
13 + hg id |
864
6225bd773c51
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
862
diff
changeset
|
14 232e179b3f29+ |
792
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
15 + hg revert |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
16 + hg diff |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
17 + hg status |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
18 + hg id |
864
6225bd773c51
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
862
diff
changeset
|
19 232e179b3f29 |
792
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
20 + hg update |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
21 + hg diff |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
22 + hg status |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
23 + hg id |
864
6225bd773c51
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
862
diff
changeset
|
24 f4d7a8c73d23 tip |
792
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
25 + hg update -C 0 |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
26 + hg update |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
27 merge: warning: conflicts during merge |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
28 merging file1 |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
29 merging file1 failed! |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
30 + hg diff |
864
6225bd773c51
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
862
diff
changeset
|
31 diff -r f4d7a8c73d23 file1 |
792
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
32 --- a/file1 |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
33 +++ b/file1 |
864
6225bd773c51
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
862
diff
changeset
|
34 @@ -1,3 +1,7 @@ |
792
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
35 added file1 |
864
6225bd773c51
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
862
diff
changeset
|
36 another line of text |
792
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
37 +<<<<<<< |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
38 +changed file1 different |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
39 +======= |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
40 changed file1 |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
41 +>>>>>>> |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
42 + hg status |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
43 M file1 |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
44 + hg id |
864
6225bd773c51
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
862
diff
changeset
|
45 f4d7a8c73d23+ tip |
792
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
46 + hg revert |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
47 + hg diff |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
48 + hg status |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
49 + hg id |
864
6225bd773c51
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
862
diff
changeset
|
50 f4d7a8c73d23 tip |
792
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
51 + hg revert -r tip |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
52 + hg diff |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
53 + hg status |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
54 + hg id |
864
6225bd773c51
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
862
diff
changeset
|
55 f4d7a8c73d23 tip |
792
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
56 + hg update -C |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
57 + hg diff |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
58 + hg status |
49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
diff
changeset
|
59 + hg id |
864
6225bd773c51
Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
862
diff
changeset
|
60 f4d7a8c73d23 tip |