Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge7.out @ 1487:2bc6cd62a29c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix handling of files of unsupported type in the walk code if a file was of unsupported type, it was considered as 'seen' while walking. this way it was possible to have file in the dirstate not yielded by the walk function.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 02 Nov 2005 15:46:31 -0800
parents bf6c91cb816f
children 6d50d6189269
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1352
bf6c91cb816f Make test-merge7 repeatable
Matt Mackall <mpm@selenic.com>
parents: 1351
diff changeset
1 pulling from ../test-a
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
2 searching for changes
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
3 adding changesets
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
4 adding manifests
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
5 adding file changes
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
6 added 1 changesets with 1 changes to 1 files (+1 heads)
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
7 (run 'hg update' to get a working copy)
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
8 merge: warning: conflicts during merge
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
9 merging test.txt
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
10 merging test.txt failed!
1352
bf6c91cb816f Make test-merge7 repeatable
Matt Mackall <mpm@selenic.com>
parents: 1351
diff changeset
11 pulling from ../test-a
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
12 searching for changes
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
13 adding changesets
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
14 adding manifests
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
15 adding file changes
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
16 added 1 changesets with 1 changes to 1 files (+1 heads)
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
17 (run 'hg update' to get a working copy)
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
18 merge: warning: conflicts during merge
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
19 resolving manifests
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
20 force None allow 1 moddirstate True linear False
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
21 ancestor 055d847dd401 local 2eded9ab0a5c remote 84cf5750dd20
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
22 test.txt versions differ, resolve
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
23 merging test.txt
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
24 resolving test.txt
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
25 file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
26 merging test.txt failed!
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
27 one
1352
bf6c91cb816f Make test-merge7 repeatable
Matt Mackall <mpm@selenic.com>
parents: 1351
diff changeset
28 <<<<<<<
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
29 two-point-five
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
30 =======
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
31 two-point-one
1352
bf6c91cb816f Make test-merge7 repeatable
Matt Mackall <mpm@selenic.com>
parents: 1351
diff changeset
32 >>>>>>>
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
33 three
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
34 rev offset length base linkrev nodeid p1 p2
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
35 0 0 7 0 0 01365c4cca56 000000000000 000000000000
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
36 1 7 9 1 1 7b013192566a 01365c4cca56 000000000000
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
37 2 16 15 2 2 8fe46a3eb557 01365c4cca56 000000000000
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
38 3 31 27 2 3 fc3148072371 7b013192566a 8fe46a3eb557
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
39 4 58 25 4 4 d40249267ae3 8fe46a3eb557 000000000000
1352
bf6c91cb816f Make test-merge7 repeatable
Matt Mackall <mpm@selenic.com>
parents: 1351
diff changeset
40 changeset: 4:40d11a4173a8
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
41 tag: tip
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
42 parent: 2:96b70246a118
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
43 user: test
1352
bf6c91cb816f Make test-merge7 repeatable
Matt Mackall <mpm@selenic.com>
parents: 1351
diff changeset
44 date: Thu Jan 1 00:00:00 1970 +0000
1351
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
45 summary: two -> two-point-one
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
46
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
47 changeset: 3:50c3a7e29886
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
48 parent: 1:d1e159716d41
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
49 parent: 2:96b70246a118
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
50 user: test
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
51 date: Thu Jan 1 00:00:00 1970 +0000
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
52 summary: Merge 1
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
53
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
54 changeset: 2:96b70246a118
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
55 parent: 0:b1832b9d912a
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
56 user: test
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
57 date: Thu Jan 1 00:00:00 1970 +0000
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
58 summary: Numbers as words
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
59
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
60 changeset: 1:d1e159716d41
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
61 user: test
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
62 date: Thu Jan 1 00:00:00 1970 +0000
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
63 summary: 2 -> 2.5
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
64
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
65 changeset: 0:b1832b9d912a
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
66 user: test
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
67 date: Thu Jan 1 00:00:00 1970 +0000
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
68 summary: Initial
0e2be889ccd7 Repair ancestor logic, fix up test cases
Matt Mackall <mpm@selenic.com>
parents:
diff changeset
69