Mercurial > hg-stable
annotate tests/test-clone-r.out @ 3881:59ec9c38f614
merge with crew
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Thu, 14 Dec 2006 13:30:47 +0100 |
parents | b2ae81a7df29 |
children | 4b0c9c674707 |
rev | line source |
---|---|
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
2 1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
1468
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
3 rev offset length base linkrev nodeid p1 p2 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
4 0 0 3 0 0 362fef284ce2 000000000000 000000000000 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
5 1 3 5 1 1 125144f7e028 362fef284ce2 000000000000 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
6 2 8 7 2 2 4c982badb186 125144f7e028 000000000000 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
7 3 15 9 3 3 19b1fc555737 4c982badb186 000000000000 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
8 rev offset length base linkrev nodeid p1 p2 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
9 0 0 75 0 7 905359268f77 000000000000 000000000000 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
10 rev offset length base linkrev nodeid p1 p2 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
11 0 0 75 0 8 905359268f77 000000000000 000000000000 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
12 rev offset length base linkrev nodeid p1 p2 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
13 0 0 8 0 6 12ab3bcc5ea4 000000000000 000000000000 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
14 rev offset length base linkrev nodeid p1 p2 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
15 0 0 48 0 0 43eadb1d2d06 000000000000 000000000000 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
16 1 48 48 1 1 8b89697eba2c 43eadb1d2d06 000000000000 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
17 2 96 48 2 2 626a32663c2f 8b89697eba2c 000000000000 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
18 3 144 48 3 3 f54c32f13478 626a32663c2f 000000000000 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
19 4 192 58 3 6 de68e904d169 626a32663c2f 000000000000 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
20 5 250 68 3 7 3b45cc2ab868 de68e904d169 000000000000 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
21 6 318 54 6 8 24d86153a002 f54c32f13478 000000000000 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
22 checking changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
23 checking manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
24 crosschecking files in changesets and manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
25 checking files |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
26 4 files, 9 changesets, 7 total revisions |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
27 requesting all changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
28 adding changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
29 adding manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
30 adding file changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
31 added 1 changesets with 1 changes to 1 files |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
32 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1468
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
33 checking changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
34 checking manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
35 crosschecking files in changesets and manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
36 checking files |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
37 1 files, 1 changesets, 1 total revisions |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
38 requesting all changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
39 adding changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
40 adding manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
41 adding file changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
42 added 2 changesets with 2 changes to 1 files |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
43 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1468
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
44 checking changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
45 checking manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
46 crosschecking files in changesets and manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
47 checking files |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
48 1 files, 2 changesets, 2 total revisions |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
49 requesting all changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
50 adding changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
51 adding manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
52 adding file changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
53 added 3 changesets with 3 changes to 1 files |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
54 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1468
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
55 checking changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
56 checking manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
57 crosschecking files in changesets and manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
58 checking files |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
59 1 files, 3 changesets, 3 total revisions |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
60 requesting all changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
61 adding changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
62 adding manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
63 adding file changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
64 added 4 changesets with 4 changes to 1 files |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
65 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1468
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
66 checking changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
67 checking manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
68 crosschecking files in changesets and manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
69 checking files |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
70 1 files, 4 changesets, 4 total revisions |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
71 requesting all changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
72 adding changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
73 adding manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
74 adding file changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
75 added 2 changesets with 2 changes to 1 files |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
76 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1468
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
77 checking changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
78 checking manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
79 crosschecking files in changesets and manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
80 checking files |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
81 1 files, 2 changesets, 2 total revisions |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
82 requesting all changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
83 adding changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
84 adding manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
85 adding file changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
86 added 3 changesets with 3 changes to 1 files |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
87 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1468
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
88 checking changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
89 checking manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
90 crosschecking files in changesets and manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
91 checking files |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
92 1 files, 3 changesets, 3 total revisions |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
93 requesting all changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
94 adding changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
95 adding manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
96 adding file changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
97 added 4 changesets with 5 changes to 2 files |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
98 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1468
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
99 checking changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
100 checking manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
101 crosschecking files in changesets and manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
102 checking files |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
103 2 files, 4 changesets, 5 total revisions |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
104 requesting all changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
105 adding changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
106 adding manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
107 adding file changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
108 added 5 changesets with 6 changes to 3 files |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
109 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1468
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
110 checking changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
111 checking manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
112 crosschecking files in changesets and manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
113 checking files |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
114 3 files, 5 changesets, 6 total revisions |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
115 requesting all changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
116 adding changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
117 adding manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
118 adding file changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
119 added 5 changesets with 5 changes to 2 files |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
120 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1468
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
121 checking changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
122 checking manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
123 crosschecking files in changesets and manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
124 checking files |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
125 2 files, 5 changesets, 5 total revisions |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
126 pulling from ../test-7 |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
127 searching for changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
128 adding changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
129 adding manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
130 adding file changes |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
131 added 4 changesets with 2 changes to 3 files (+1 heads) |
2019
ced2d3620f95
add merge command. means same thing as "update -m".
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
1468
diff
changeset
|
132 (run 'hg heads' to see heads, 'hg merge' to merge) |
1468
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
133 checking changesets |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
134 checking manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
135 crosschecking files in changesets and manifests |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
136 checking files |
dc1bbc456b96
Added a test for clone -r.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
137 4 files, 9 changesets, 7 total revisions |