Mercurial > hg-stable

comparison tests/test-subrepo.t @ 12640:6cc4b14fb76b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: remove redundant globs Many globs now just match $TESTTMP and is no longer needed.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 08 Oct 2010 22:36:10 -0500
parents e3247ceaca5e
children ef5eaf53f4f7
comparison
equal deleted inserted replaced
12639:236058a65cb4 12640:6cc4b14fb76b
234 clone 234 clone
235 235
236 $ cd .. 236 $ cd ..
237 $ hg clone t tc 237 $ hg clone t tc
238 updating to branch default 238 updating to branch default
239 pulling subrepo s from */sub/t/s (glob) 239 pulling subrepo s from $TESTTMP/sub/t/s
240 requesting all changes 240 requesting all changes
241 adding changesets 241 adding changesets
242 adding manifests 242 adding manifests
243 adding file changes 243 adding file changes
244 added 4 changesets with 5 changes to 3 files 244 added 4 changesets with 5 changes to 3 files
245 pulling subrepo s/ss from */sub/t/s/ss (glob) 245 pulling subrepo s/ss from $TESTTMP/sub/t/s/ss
246 requesting all changes 246 requesting all changes
247 adding changesets 247 adding changesets
248 adding manifests 248 adding manifests
249 adding file changes 249 adding file changes
250 added 1 changesets with 1 changes to 1 files 250 added 1 changesets with 1 changes to 1 files
251 pulling subrepo t from */sub/t/t (glob) 251 pulling subrepo t from $TESTTMP/sub/t/t
252 requesting all changes 252 requesting all changes
253 adding changesets 253 adding changesets
254 adding manifests 254 adding manifests
255 adding file changes 255 adding file changes
256 added 4 changesets with 4 changes to 1 files (+1 heads) 256 added 4 changesets with 4 changes to 1 files (+1 heads)
268 268
269 $ echo bah > t/t 269 $ echo bah > t/t
270 $ hg ci -m11 270 $ hg ci -m11
271 committing subrepository t 271 committing subrepository t
272 $ hg push 272 $ hg push
273 pushing *sub/t (glob) 273 pushing to $TESTTMP/sub/t
274 pushing *sub/t/s/ss (glob) 274 pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
275 searching for changes 275 searching for changes
276 no changes found 276 no changes found
277 pushing *sub/t/s (glob) 277 pushing subrepo s to $TESTTMP/sub/t/s
278 searching for changes 278 searching for changes
279 no changes found 279 no changes found
280 pushing *sub/t/t (glob) 280 pushing subrepo t to $TESTTMP/sub/t/t
281 searching for changes 281 searching for changes
282 adding changesets 282 adding changesets
283 adding manifests 283 adding manifests
284 adding file changes 284 adding file changes
285 added 1 changesets with 1 changes to 1 files 285 added 1 changesets with 1 changes to 1 files
293 293
294 $ echo bah > s/a 294 $ echo bah > s/a
295 $ hg ci -m12 295 $ hg ci -m12
296 committing subrepository s 296 committing subrepository s
297 $ hg push 297 $ hg push
298 pushing *sub/t (glob) 298 pushing to $TESTTMP/sub/t
299 pushing *sub/t/s/ss (glob) 299 pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
300 searching for changes 300 searching for changes
301 no changes found 301 no changes found
302 pushing *sub/t/s (glob) 302 pushing subrepo s to $TESTTMP/sub/t/s
303 searching for changes 303 searching for changes
304 abort: push creates new remote heads on branch 'default'! 304 abort: push creates new remote heads on branch 'default'!
305 (did you forget to merge? use push -f to force) 305 (did you forget to merge? use push -f to force)
306 [255] 306 [255]
307 $ hg push -f 307 $ hg push -f
308 pushing *sub/t (glob) 308 pushing to $TESTTMP/sub/t
309 pushing *sub/t/s/ss (glob) 309 pushing subrepo s/ss to $TESTTMP/sub/t/s/ss
310 searching for changes 310 searching for changes
311 no changes found 311 no changes found
312 pushing *sub/t/s (glob) 312 pushing subrepo s to $TESTTMP/sub/t/s
313 searching for changes 313 searching for changes
314 adding changesets 314 adding changesets
315 adding manifests 315 adding manifests
316 adding file changes 316 adding file changes
317 added 1 changesets with 1 changes to 1 files (+1 heads) 317 added 1 changesets with 1 changes to 1 files (+1 heads)
318 pushing *sub/t/t (glob) 318 pushing subrepo t to $TESTTMP/sub/t/t
319 searching for changes 319 searching for changes
320 no changes found 320 no changes found
321 searching for changes 321 searching for changes
322 adding changesets 322 adding changesets
323 adding manifests 323 adding manifests
335 335
336 pull 336 pull
337 337
338 $ cd ../tc 338 $ cd ../tc
339 $ hg pull 339 $ hg pull
340 pulling *sub/t (glob) 340 pulling from $TESTTMP/sub/t
341 searching for changes 341 searching for changes
342 adding changesets 342 adding changesets
343 adding manifests 343 adding manifests
344 adding file changes 344 adding file changes
345 added 1 changesets with 1 changes to 1 files 345 added 1 changesets with 1 changes to 1 files
346 (run 'hg update' to get a working copy) 346 (run 'hg update' to get a working copy)
347 347
348 should pull t 348 should pull t
349 349
350 $ hg up 350 $ hg up
351 pulling subrepo t from */sub/t/t (glob) 351 pulling subrepo t from $TESTTMP/sub/t/t
352 searching for changes 352 searching for changes
353 adding changesets 353 adding changesets
354 adding manifests 354 adding manifests
355 adding file changes 355 adding file changes
356 added 1 changesets with 1 changes to 1 files 356 added 1 changesets with 1 changes to 1 files
540 updating to branch default 540 updating to branch default
541 2 files updated, 0 files merged, 0 files removed, 0 files unresolved 541 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
542 $ cat mercurial2/main/nested_absolute/.hg/hgrc \ 542 $ cat mercurial2/main/nested_absolute/.hg/hgrc \
543 > mercurial2/main/nested_relative/.hg/hgrc 543 > mercurial2/main/nested_relative/.hg/hgrc
544 [paths] 544 [paths]
545 default = */sub/mercurial/nested_absolute (glob) 545 default = $TESTTMP/sub/mercurial/nested_absolute
546 [paths] 546 [paths]
547 default = */sub/mercurial/nested_relative (glob) 547 default = $TESTTMP/sub/mercurial/nested_relative
548 $ rm -rf mercurial mercurial2 548 $ rm -rf mercurial mercurial2
549 549
550 Issue1977: multirepo push should fail if subrepo push fails 550 Issue1977: multirepo push should fail if subrepo push fails
551 551
552 $ hg init repo 552 $ hg init repo
558 $ hg -R repo ci -Am1 558 $ hg -R repo ci -Am1
559 adding .hgsub 559 adding .hgsub
560 committing subrepository s 560 committing subrepository s
561 $ hg clone repo repo2 561 $ hg clone repo repo2
562 updating to branch default 562 updating to branch default
563 pulling subrepo s from */sub/repo/s (glob) 563 pulling subrepo s from $TESTTMP/sub/repo/s
564 requesting all changes 564 requesting all changes
565 adding changesets 565 adding changesets
566 adding manifests 566 adding manifests
567 adding file changes 567 adding file changes
568 added 1 changesets with 1 changes to 1 files 568 added 1 changesets with 1 changes to 1 files