equal
deleted
inserted
replaced
271 searching for changes |
271 searching for changes |
272 no changes found |
272 no changes found |
273 comparing with */test-subrepo-recursion.t/repo/foo (glob) |
273 comparing with */test-subrepo-recursion.t/repo/foo (glob) |
274 searching for changes |
274 searching for changes |
275 no changes found |
275 no changes found |
|
276 comparing with */test-subrepo-recursion.t/repo/foo/bar (glob) |
|
277 searching for changes |
|
278 no changes found |
276 [1] |
279 [1] |
277 |
280 |
278 Make nested change: |
281 Make nested change: |
279 |
282 |
280 $ echo y4 >> foo/y.txt |
283 $ echo y4 >> foo/y.txt |
304 tag: tip |
307 tag: tip |
305 user: test |
308 user: test |
306 date: Thu Jan 01 00:00:00 1970 +0000 |
309 date: Thu Jan 01 00:00:00 1970 +0000 |
307 summary: 3-4-2 |
310 summary: 3-4-2 |
308 |
311 |
|
312 comparing with */test-subrepo-recursion.t/repo/foo/bar (glob) |
|
313 searching for changes |
|
314 no changes found |
309 |
315 |
310 Switch to original repo and setup default path: |
316 Switch to original repo and setup default path: |
311 |
317 |
312 $ cd ../repo |
318 $ cd ../repo |
313 $ echo '[paths]' >> .hg/hgrc |
319 $ echo '[paths]' >> .hg/hgrc |
330 tag: tip |
336 tag: tip |
331 user: test |
337 user: test |
332 date: Thu Jan 01 00:00:00 1970 +0000 |
338 date: Thu Jan 01 00:00:00 1970 +0000 |
333 summary: 3-4-2 |
339 summary: 3-4-2 |
334 |
340 |
|
341 comparing with */test-subrepo-recursion.t/repo2/foo/bar (glob) |
|
342 searching for changes |
|
343 no changes found |
|
344 |
335 $ hg incoming -S --bundle incoming.hg |
345 $ hg incoming -S --bundle incoming.hg |
336 abort: cannot combine --bundle and --subrepos |
346 abort: cannot combine --bundle and --subrepos |
337 [255] |
347 [255] |
338 |
348 |
339 Test missing subrepo: |
349 Test missing subrepo: |