Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-clone-r.out @ 2178:00205fe76993
merge with crew.
author | Vadim Gelfer <vadim.gelfer@gmail.com> |
---|---|
date | Tue, 02 May 2006 14:38:32 -0700 |
parents | b2ae81a7df29 |
children |
comparison
equal
deleted
inserted
replaced
2177:6886bc0b77af | 2178:00205fe76993 |
---|---|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
2 1 files updated, 0 files merged, 2 files removed, 0 files unresolved | |
1 rev offset length base linkrev nodeid p1 p2 | 3 rev offset length base linkrev nodeid p1 p2 |
2 0 0 3 0 0 362fef284ce2 000000000000 000000000000 | 4 0 0 3 0 0 362fef284ce2 000000000000 000000000000 |
3 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 | 5 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 |
4 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 | 6 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 |
5 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 | 7 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 |
25 requesting all changes | 27 requesting all changes |
26 adding changesets | 28 adding changesets |
27 adding manifests | 29 adding manifests |
28 adding file changes | 30 adding file changes |
29 added 1 changesets with 1 changes to 1 files | 31 added 1 changesets with 1 changes to 1 files |
32 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
30 checking changesets | 33 checking changesets |
31 checking manifests | 34 checking manifests |
32 crosschecking files in changesets and manifests | 35 crosschecking files in changesets and manifests |
33 checking files | 36 checking files |
34 1 files, 1 changesets, 1 total revisions | 37 1 files, 1 changesets, 1 total revisions |
35 requesting all changes | 38 requesting all changes |
36 adding changesets | 39 adding changesets |
37 adding manifests | 40 adding manifests |
38 adding file changes | 41 adding file changes |
39 added 2 changesets with 2 changes to 1 files | 42 added 2 changesets with 2 changes to 1 files |
43 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
40 checking changesets | 44 checking changesets |
41 checking manifests | 45 checking manifests |
42 crosschecking files in changesets and manifests | 46 crosschecking files in changesets and manifests |
43 checking files | 47 checking files |
44 1 files, 2 changesets, 2 total revisions | 48 1 files, 2 changesets, 2 total revisions |
45 requesting all changes | 49 requesting all changes |
46 adding changesets | 50 adding changesets |
47 adding manifests | 51 adding manifests |
48 adding file changes | 52 adding file changes |
49 added 3 changesets with 3 changes to 1 files | 53 added 3 changesets with 3 changes to 1 files |
54 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
50 checking changesets | 55 checking changesets |
51 checking manifests | 56 checking manifests |
52 crosschecking files in changesets and manifests | 57 crosschecking files in changesets and manifests |
53 checking files | 58 checking files |
54 1 files, 3 changesets, 3 total revisions | 59 1 files, 3 changesets, 3 total revisions |
55 requesting all changes | 60 requesting all changes |
56 adding changesets | 61 adding changesets |
57 adding manifests | 62 adding manifests |
58 adding file changes | 63 adding file changes |
59 added 4 changesets with 4 changes to 1 files | 64 added 4 changesets with 4 changes to 1 files |
65 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
60 checking changesets | 66 checking changesets |
61 checking manifests | 67 checking manifests |
62 crosschecking files in changesets and manifests | 68 crosschecking files in changesets and manifests |
63 checking files | 69 checking files |
64 1 files, 4 changesets, 4 total revisions | 70 1 files, 4 changesets, 4 total revisions |
65 requesting all changes | 71 requesting all changes |
66 adding changesets | 72 adding changesets |
67 adding manifests | 73 adding manifests |
68 adding file changes | 74 adding file changes |
69 added 2 changesets with 2 changes to 1 files | 75 added 2 changesets with 2 changes to 1 files |
76 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
70 checking changesets | 77 checking changesets |
71 checking manifests | 78 checking manifests |
72 crosschecking files in changesets and manifests | 79 crosschecking files in changesets and manifests |
73 checking files | 80 checking files |
74 1 files, 2 changesets, 2 total revisions | 81 1 files, 2 changesets, 2 total revisions |
75 requesting all changes | 82 requesting all changes |
76 adding changesets | 83 adding changesets |
77 adding manifests | 84 adding manifests |
78 adding file changes | 85 adding file changes |
79 added 3 changesets with 3 changes to 1 files | 86 added 3 changesets with 3 changes to 1 files |
87 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
80 checking changesets | 88 checking changesets |
81 checking manifests | 89 checking manifests |
82 crosschecking files in changesets and manifests | 90 crosschecking files in changesets and manifests |
83 checking files | 91 checking files |
84 1 files, 3 changesets, 3 total revisions | 92 1 files, 3 changesets, 3 total revisions |
85 requesting all changes | 93 requesting all changes |
86 adding changesets | 94 adding changesets |
87 adding manifests | 95 adding manifests |
88 adding file changes | 96 adding file changes |
89 added 4 changesets with 5 changes to 2 files | 97 added 4 changesets with 5 changes to 2 files |
98 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
90 checking changesets | 99 checking changesets |
91 checking manifests | 100 checking manifests |
92 crosschecking files in changesets and manifests | 101 crosschecking files in changesets and manifests |
93 checking files | 102 checking files |
94 2 files, 4 changesets, 5 total revisions | 103 2 files, 4 changesets, 5 total revisions |
95 requesting all changes | 104 requesting all changes |
96 adding changesets | 105 adding changesets |
97 adding manifests | 106 adding manifests |
98 adding file changes | 107 adding file changes |
99 added 5 changesets with 6 changes to 3 files | 108 added 5 changesets with 6 changes to 3 files |
109 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
100 checking changesets | 110 checking changesets |
101 checking manifests | 111 checking manifests |
102 crosschecking files in changesets and manifests | 112 crosschecking files in changesets and manifests |
103 checking files | 113 checking files |
104 3 files, 5 changesets, 6 total revisions | 114 3 files, 5 changesets, 6 total revisions |
105 requesting all changes | 115 requesting all changes |
106 adding changesets | 116 adding changesets |
107 adding manifests | 117 adding manifests |
108 adding file changes | 118 adding file changes |
109 added 5 changesets with 5 changes to 2 files | 119 added 5 changesets with 5 changes to 2 files |
120 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
110 checking changesets | 121 checking changesets |
111 checking manifests | 122 checking manifests |
112 crosschecking files in changesets and manifests | 123 crosschecking files in changesets and manifests |
113 checking files | 124 checking files |
114 2 files, 5 changesets, 5 total revisions | 125 2 files, 5 changesets, 5 total revisions |