Show More
| @@ -1,295 +1,295 | |||
|
|
1 | 1 | % first revision, no sub |
|
|
2 | 2 | adding a |
|
|
3 | 3 | % add first sub |
|
|
4 | 4 | adding a |
|
|
5 | 5 | parent: 0:f7b1eb17ad24 tip |
|
|
6 | 6 | 0 |
|
|
7 | 7 | branch: default |
|
|
8 | 8 | commit: 1 added, 1 subrepos |
|
|
9 | 9 | update: (current) |
|
|
10 | 10 | committing subrepository s |
|
|
11 | 11 | % add sub sub |
|
|
12 | 12 | parent: 1:7cf8cfea66e4 tip |
|
|
13 | 13 | 1 |
|
|
14 | 14 | branch: default |
|
|
15 | 15 | commit: 1 subrepos |
|
|
16 | 16 | update: (current) |
|
|
17 | 17 | committing subrepository s |
|
|
18 | committing subrepository ss | |
|
|
18 | committing subrepository s/ss | |
|
|
19 | 19 | parent: 2:df30734270ae tip |
|
|
20 | 20 | 2 |
|
|
21 | 21 | branch: default |
|
|
22 | 22 | commit: (clean) |
|
|
23 | 23 | update: (current) |
|
|
24 | 24 | % bump sub rev |
|
|
25 | 25 | committing subrepository s |
|
|
26 | 26 | % leave sub dirty |
|
|
27 | 27 | committing subrepository s |
|
|
28 | 28 | changeset: 3:1c833a7a9e3a |
|
|
29 | 29 | tag: tip |
|
|
30 | 30 | user: test |
|
|
31 | 31 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
|
32 | 32 | summary: 4 |
|
|
33 | 33 | |
|
|
34 | 34 | % check caching |
|
|
35 | 35 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
|
36 | 36 | % restore |
|
|
37 | 37 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
38 | 38 | path s |
|
|
39 | 39 | source s |
|
|
40 | 40 | revision 1c833a7a9e3a4445c711aaf0f012379cd0d4034e |
|
|
41 | 41 | % new branch for merge tests |
|
|
42 | 42 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
43 | 43 | adding t/t |
|
|
44 | 44 | % 5 |
|
|
45 | 45 | committing subrepository t |
|
|
46 | 46 | created new head |
|
|
47 | 47 | % 6 |
|
|
48 | 48 | committing subrepository t |
|
|
49 | 49 | path s |
|
|
50 | 50 | source s |
|
|
51 | 51 | revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 |
|
|
52 | 52 | path t |
|
|
53 | 53 | source t |
|
|
54 | 54 | revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad |
|
|
55 | 55 | % 7 |
|
|
56 | 56 | committing subrepository t |
|
|
57 | 57 | % 8 |
|
|
58 | 58 | % merge tests |
|
|
59 | 59 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
60 | 60 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
61 | 61 | (branch merge, don't forget to commit) |
|
|
62 | 62 | path s |
|
|
63 | 63 | source s |
|
|
64 | 64 | revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 |
|
|
65 | 65 | path t |
|
|
66 | 66 | source t |
|
|
67 | 67 | revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382 |
|
|
68 | 68 | created new head |
|
|
69 | 69 | searching for copies back to rev 2 |
|
|
70 | 70 | resolving manifests |
|
|
71 | 71 | overwrite None partial False |
|
|
72 | 72 | ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4 |
|
|
73 | 73 | .hgsubstate: versions differ -> m |
|
|
74 | 74 | update: .hgsubstate 1/1 files (100.00%) |
|
|
75 | 75 | subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec |
|
|
76 | 76 | subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg |
|
|
77 | 77 | getting subrepo t |
|
|
78 | 78 | resolving manifests |
|
|
79 | 79 | overwrite True partial False |
|
|
80 | 80 | ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a |
|
|
81 | 81 | t: remote is newer -> g |
|
|
82 | 82 | update: t 1/1 files (100.00%) |
|
|
83 | 83 | getting t |
|
|
84 | 84 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
85 | 85 | (branch merge, don't forget to commit) |
|
|
86 | 86 | path s |
|
|
87 | 87 | source s |
|
|
88 | 88 | revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 |
|
|
89 | 89 | path t |
|
|
90 | 90 | source t |
|
|
91 | 91 | revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad |
|
|
92 | 92 | committing subrepository t |
|
|
93 | 93 | searching for copies back to rev 2 |
|
|
94 | 94 | resolving manifests |
|
|
95 | 95 | overwrite None partial False |
|
|
96 | 96 | ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf |
|
|
97 | 97 | .hgsubstate: versions differ -> m |
|
|
98 | 98 | update: .hgsubstate 1/1 files (100.00%) |
|
|
99 | 99 | subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4 |
|
|
100 | 100 | subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg |
|
|
101 | 101 | merging subrepo t |
|
|
102 | 102 | searching for copies back to rev 2 |
|
|
103 | 103 | resolving manifests |
|
|
104 | 104 | overwrite None partial False |
|
|
105 | 105 | ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198 |
|
|
106 | 106 | t: versions differ -> m |
|
|
107 | 107 | preserving t for resolve of t |
|
|
108 | 108 | update: t 1/1 files (100.00%) |
|
|
109 | 109 | picked tool 'internal:merge' for t (binary False symlink False) |
|
|
110 | 110 | merging t |
|
|
111 | 111 | my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a |
|
|
112 | 112 | warning: conflicts during merge. |
|
|
113 | 113 | merging t failed! |
|
|
114 | 114 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
|
115 | 115 | use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
|
|
116 | 116 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
117 | 117 | (branch merge, don't forget to commit) |
|
|
118 | 118 | % should conflict |
|
|
119 | 119 | <<<<<<< local |
|
|
120 | 120 | conflict |
|
|
121 | 121 | ======= |
|
|
122 | 122 | t3 |
|
|
123 | 123 | >>>>>>> other |
|
|
124 | 124 | % clone |
|
|
125 | 125 | updating to branch default |
|
|
126 | 126 | pulling subrepo s from .../sub/t/s |
|
|
127 | 127 | requesting all changes |
|
|
128 | 128 | adding changesets |
|
|
129 | 129 | adding manifests |
|
|
130 | 130 | adding file changes |
|
|
131 | 131 | added 4 changesets with 5 changes to 3 files |
|
|
132 | 132 | pulling subrepo s/ss from .../sub/t/s/ss |
|
|
133 | 133 | requesting all changes |
|
|
134 | 134 | adding changesets |
|
|
135 | 135 | adding manifests |
|
|
136 | 136 | adding file changes |
|
|
137 | 137 | added 1 changesets with 1 changes to 1 files |
|
|
138 | 138 | pulling subrepo t from .../sub/t/t |
|
|
139 | 139 | requesting all changes |
|
|
140 | 140 | adding changesets |
|
|
141 | 141 | adding manifests |
|
|
142 | 142 | adding file changes |
|
|
143 | 143 | added 4 changesets with 4 changes to 1 files (+1 heads) |
|
|
144 | 144 | 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
145 | 145 | path s |
|
|
146 | 146 | source s |
|
|
147 | 147 | revision fc627a69481fcbe5f1135069e8a3881c023e4cf5 |
|
|
148 | 148 | path t |
|
|
149 | 149 | source t |
|
|
150 | 150 | revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e |
|
|
151 | 151 | % push |
|
|
152 | 152 | committing subrepository t |
|
|
153 | 153 | pushing ...sub/t |
|
|
154 | 154 | pushing ...sub/t/s/ss |
|
|
155 | 155 | searching for changes |
|
|
156 | 156 | no changes found |
|
|
157 | 157 | pushing ...sub/t/s |
|
|
158 | 158 | searching for changes |
|
|
159 | 159 | no changes found |
|
|
160 | 160 | pushing ...sub/t/t |
|
|
161 | 161 | searching for changes |
|
|
162 | 162 | adding changesets |
|
|
163 | 163 | adding manifests |
|
|
164 | 164 | adding file changes |
|
|
165 | 165 | added 1 changesets with 1 changes to 1 files |
|
|
166 | 166 | searching for changes |
|
|
167 | 167 | adding changesets |
|
|
168 | 168 | adding manifests |
|
|
169 | 169 | adding file changes |
|
|
170 | 170 | added 1 changesets with 1 changes to 1 files |
|
|
171 | 171 | % push -f |
|
|
172 | 172 | committing subrepository s |
|
|
173 | 173 | abort: push creates new remote heads on branch 'default'! |
|
|
174 | 174 | pushing ...sub/t |
|
|
175 | 175 | pushing ...sub/t/s/ss |
|
|
176 | 176 | searching for changes |
|
|
177 | 177 | no changes found |
|
|
178 | 178 | pushing ...sub/t/s |
|
|
179 | 179 | searching for changes |
|
|
180 | 180 | (did you forget to merge? use push -f to force) |
|
|
181 | 181 | pushing ...sub/t |
|
|
182 | 182 | pushing ...sub/t/s/ss |
|
|
183 | 183 | searching for changes |
|
|
184 | 184 | no changes found |
|
|
185 | 185 | pushing ...sub/t/s |
|
|
186 | 186 | searching for changes |
|
|
187 | 187 | adding changesets |
|
|
188 | 188 | adding manifests |
|
|
189 | 189 | adding file changes |
|
|
190 | 190 | added 1 changesets with 1 changes to 1 files (+1 heads) |
|
|
191 | 191 | pushing ...sub/t/t |
|
|
192 | 192 | searching for changes |
|
|
193 | 193 | no changes found |
|
|
194 | 194 | searching for changes |
|
|
195 | 195 | adding changesets |
|
|
196 | 196 | adding manifests |
|
|
197 | 197 | adding file changes |
|
|
198 | 198 | added 1 changesets with 1 changes to 1 files |
|
|
199 | 199 | % update |
|
|
200 | 200 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
201 | 201 | committing subrepository t |
|
|
202 | 202 | % pull |
|
|
203 | 203 | pulling ...sub/t |
|
|
204 | 204 | searching for changes |
|
|
205 | 205 | adding changesets |
|
|
206 | 206 | adding manifests |
|
|
207 | 207 | adding file changes |
|
|
208 | 208 | added 1 changesets with 1 changes to 1 files |
|
|
209 | 209 | (run 'hg update' to get a working copy) |
|
|
210 | 210 | pulling subrepo t from .../sub/t/t |
|
|
211 | 211 | searching for changes |
|
|
212 | 212 | adding changesets |
|
|
213 | 213 | adding manifests |
|
|
214 | 214 | adding file changes |
|
|
215 | 215 | added 1 changesets with 1 changes to 1 files |
|
|
216 | 216 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
217 | 217 | blah |
|
|
218 | 218 | % bogus subrepo path aborts |
|
|
219 | 219 | abort: missing ] in subrepo source |
|
|
220 | 220 | % issue 1986 |
|
|
221 | 221 | adding a |
|
|
222 | 222 | marked working directory as branch br |
|
|
223 | 223 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
224 | 224 | adding b |
|
|
225 | 225 | created new head |
|
|
226 | 226 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
227 | 227 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
228 | 228 | (branch merge, don't forget to commit) |
|
|
229 | 229 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
230 | 230 | adding c |
|
|
231 | 231 | created new head |
|
|
232 | 232 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
233 | 233 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
234 | 234 | (branch merge, don't forget to commit) |
|
|
235 | 235 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
236 | 236 | adding .hgsub |
|
|
237 | 237 | committing subrepository s |
|
|
238 | 238 | marked working directory as branch br |
|
|
239 | 239 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
240 | 240 | adding b |
|
|
241 | 241 | committing subrepository s |
|
|
242 | 242 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
243 | 243 | adding c |
|
|
244 | 244 | created new head |
|
|
245 | 245 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
246 | 246 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
247 | 247 | (branch merge, don't forget to commit) |
|
|
248 | 248 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
249 | 249 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
250 | 250 | adding d |
|
|
251 | 251 | committing subrepository s |
|
|
252 | 252 | created new head |
|
|
253 | 253 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|
254 | 254 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
255 | 255 | adding e |
|
|
256 | 256 | committing subrepository s |
|
|
257 | 257 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
258 | 258 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
259 | 259 | (branch merge, don't forget to commit) |
|
|
260 | 260 | % test subrepo delete from .hgsubstate |
|
|
261 | 261 | adding testdelete/nested/foo |
|
|
262 | 262 | adding testdelete/nested2/foo |
|
|
263 | 263 | adding testdelete/.hgsub |
|
|
264 | 264 | committing subrepository nested2 |
|
|
265 | 265 | committing subrepository nested |
|
|
266 | 266 | nested |
|
|
267 | 267 | % test repository cloning |
|
|
268 | 268 | adding nested_absolute/foo |
|
|
269 | 269 | adding nested_relative/foo2 |
|
|
270 | 270 | adding main/.hgsub |
|
|
271 | 271 | committing subrepository nested_relative |
|
|
272 | 272 | committing subrepository nested_absolute |
|
|
273 | 273 | updating to branch default |
|
|
274 | 274 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
275 | 275 | [paths] |
|
|
276 | 276 | default = $HGTMP/test-subrepo/sub/mercurial/nested_absolute |
|
|
277 | 277 | [paths] |
|
|
278 | 278 | default = $HGTMP/test-subrepo/sub/mercurial/nested_relative |
|
|
279 | 279 | % issue 1977 |
|
|
280 | 280 | adding a |
|
|
281 | 281 | adding .hgsub |
|
|
282 | 282 | committing subrepository s |
|
|
283 | 283 | updating to branch default |
|
|
284 | 284 | pulling subrepo s from .../sub/repo/s |
|
|
285 | 285 | requesting all changes |
|
|
286 | 286 | adding changesets |
|
|
287 | 287 | adding manifests |
|
|
288 | 288 | adding file changes |
|
|
289 | 289 | added 1 changesets with 1 changes to 1 files |
|
|
290 | 290 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
291 | 291 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|
292 | 292 | created new head |
|
|
293 | 293 | committing subrepository s |
|
|
294 | 294 | abort: push creates new remote heads on branch 'default'! |
|
|
295 | 295 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now