equal
deleted
inserted
replaced
23 checking manifests |
23 checking manifests |
24 crosschecking files in changesets and manifests |
24 crosschecking files in changesets and manifests |
25 checking files |
25 checking files |
26 4 files, 9 changesets, 7 total revisions |
26 4 files, 9 changesets, 7 total revisions |
27 searching for changes |
27 searching for changes |
|
28 1 changesets found |
28 adding changesets |
29 adding changesets |
29 adding manifests |
30 adding manifests |
30 adding file changes |
31 adding file changes |
31 added 1 changesets with 1 changes to 1 files |
32 added 1 changesets with 1 changes to 1 files |
32 (run 'hg update' to get a working copy) |
33 (run 'hg update' to get a working copy) |
35 crosschecking files in changesets and manifests |
36 crosschecking files in changesets and manifests |
36 checking files |
37 checking files |
37 1 files, 1 changesets, 1 total revisions |
38 1 files, 1 changesets, 1 total revisions |
38 0:5649c9d34dd8 |
39 0:5649c9d34dd8 |
39 searching for changes |
40 searching for changes |
|
41 2 changesets found |
40 adding changesets |
42 adding changesets |
41 adding manifests |
43 adding manifests |
42 adding file changes |
44 adding file changes |
43 added 2 changesets with 2 changes to 1 files |
45 added 2 changesets with 2 changes to 1 files |
44 (run 'hg update' to get a working copy) |
46 (run 'hg update' to get a working copy) |
47 crosschecking files in changesets and manifests |
49 crosschecking files in changesets and manifests |
48 checking files |
50 checking files |
49 1 files, 2 changesets, 2 total revisions |
51 1 files, 2 changesets, 2 total revisions |
50 1:10b2180f755b |
52 1:10b2180f755b |
51 searching for changes |
53 searching for changes |
|
54 3 changesets found |
52 adding changesets |
55 adding changesets |
53 adding manifests |
56 adding manifests |
54 adding file changes |
57 adding file changes |
55 added 3 changesets with 3 changes to 1 files |
58 added 3 changesets with 3 changes to 1 files |
56 (run 'hg update' to get a working copy) |
59 (run 'hg update' to get a working copy) |
59 crosschecking files in changesets and manifests |
62 crosschecking files in changesets and manifests |
60 checking files |
63 checking files |
61 1 files, 3 changesets, 3 total revisions |
64 1 files, 3 changesets, 3 total revisions |
62 2:d62976ca1e50 |
65 2:d62976ca1e50 |
63 searching for changes |
66 searching for changes |
|
67 4 changesets found |
64 adding changesets |
68 adding changesets |
65 adding manifests |
69 adding manifests |
66 adding file changes |
70 adding file changes |
67 added 4 changesets with 4 changes to 1 files |
71 added 4 changesets with 4 changes to 1 files |
68 (run 'hg update' to get a working copy) |
72 (run 'hg update' to get a working copy) |
71 crosschecking files in changesets and manifests |
75 crosschecking files in changesets and manifests |
72 checking files |
76 checking files |
73 1 files, 4 changesets, 4 total revisions |
77 1 files, 4 changesets, 4 total revisions |
74 3:ac69c658229d |
78 3:ac69c658229d |
75 searching for changes |
79 searching for changes |
|
80 2 changesets found |
76 adding changesets |
81 adding changesets |
77 adding manifests |
82 adding manifests |
78 adding file changes |
83 adding file changes |
79 added 2 changesets with 2 changes to 1 files |
84 added 2 changesets with 2 changes to 1 files |
80 (run 'hg update' to get a working copy) |
85 (run 'hg update' to get a working copy) |
83 crosschecking files in changesets and manifests |
88 crosschecking files in changesets and manifests |
84 checking files |
89 checking files |
85 1 files, 2 changesets, 2 total revisions |
90 1 files, 2 changesets, 2 total revisions |
86 1:5f4f3ceb285e |
91 1:5f4f3ceb285e |
87 searching for changes |
92 searching for changes |
|
93 3 changesets found |
88 adding changesets |
94 adding changesets |
89 adding manifests |
95 adding manifests |
90 adding file changes |
96 adding file changes |
91 added 3 changesets with 3 changes to 1 files |
97 added 3 changesets with 3 changes to 1 files |
92 (run 'hg update' to get a working copy) |
98 (run 'hg update' to get a working copy) |
95 crosschecking files in changesets and manifests |
101 crosschecking files in changesets and manifests |
96 checking files |
102 checking files |
97 1 files, 3 changesets, 3 total revisions |
103 1 files, 3 changesets, 3 total revisions |
98 2:024e4e7df376 |
104 2:024e4e7df376 |
99 searching for changes |
105 searching for changes |
|
106 4 changesets found |
100 adding changesets |
107 adding changesets |
101 adding manifests |
108 adding manifests |
102 adding file changes |
109 adding file changes |
103 added 4 changesets with 5 changes to 2 files |
110 added 4 changesets with 5 changes to 2 files |
104 (run 'hg update' to get a working copy) |
111 (run 'hg update' to get a working copy) |
107 crosschecking files in changesets and manifests |
114 crosschecking files in changesets and manifests |
108 checking files |
115 checking files |
109 2 files, 4 changesets, 5 total revisions |
116 2 files, 4 changesets, 5 total revisions |
110 3:1e3f6b843bd6 |
117 3:1e3f6b843bd6 |
111 searching for changes |
118 searching for changes |
|
119 5 changesets found |
112 adding changesets |
120 adding changesets |
113 adding manifests |
121 adding manifests |
114 adding file changes |
122 adding file changes |
115 added 5 changesets with 6 changes to 3 files |
123 added 5 changesets with 6 changes to 3 files |
116 (run 'hg update' to get a working copy) |
124 (run 'hg update' to get a working copy) |
119 crosschecking files in changesets and manifests |
127 crosschecking files in changesets and manifests |
120 checking files |
128 checking files |
121 3 files, 5 changesets, 6 total revisions |
129 3 files, 5 changesets, 6 total revisions |
122 4:80fe151401c2 |
130 4:80fe151401c2 |
123 searching for changes |
131 searching for changes |
|
132 5 changesets found |
124 adding changesets |
133 adding changesets |
125 adding manifests |
134 adding manifests |
126 adding file changes |
135 adding file changes |
127 added 5 changesets with 5 changes to 2 files |
136 added 5 changesets with 5 changes to 2 files |
128 (run 'hg update' to get a working copy) |
137 (run 'hg update' to get a working copy) |
146 4 files, 9 changesets, 7 total revisions |
155 4 files, 9 changesets, 7 total revisions |
147 rolling back last transaction |
156 rolling back last transaction |
148 % should fail |
157 % should fail |
149 abort: --base is incompatible with specifiying a destination |
158 abort: --base is incompatible with specifiying a destination |
150 abort: repository default-push not found! |
159 abort: repository default-push not found! |
|
160 2 changesets found |
|
161 4 changesets found |
|
162 6 changesets found |
|
163 1 changesets found |
|
164 1 changesets found |
151 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
165 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
152 % 2 |
166 % 2 |
153 2:d62976ca1e50 |
167 2:d62976ca1e50 |
154 adding changesets |
168 adding changesets |
155 transaction abort! |
169 transaction abort! |
200 warning: detected divergent renames of afile to: |
214 warning: detected divergent renames of afile to: |
201 anotherfile |
215 anotherfile |
202 adifferentfile |
216 adifferentfile |
203 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
217 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
204 (branch merge, don't forget to commit) |
218 (branch merge, don't forget to commit) |
|
219 7 changesets found |
205 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
220 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
206 adding changesets |
221 adding changesets |
207 adding manifests |
222 adding manifests |
208 adding file changes |
223 adding file changes |
209 added 7 changesets with 4 changes to 4 files |
224 added 7 changesets with 4 changes to 4 files |