Mercurial > hg-stable
comparison tests/test-subrepo.t @ 19218:475a4b13263f stable
tests: backport some glob fixups
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 21 May 2013 15:29:53 -0500 |
parents | 98406218117a |
children | 6cf8e3b4e074 |
comparison
equal
deleted
inserted
replaced
19217:2b4344f23b44 | 19218:475a4b13263f |
---|---|
389 its working directory does not make its store dirty | 389 its working directory does not make its store dirty |
390 | 390 |
391 $ hg -R s update '.^' | 391 $ hg -R s update '.^' |
392 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 392 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
393 $ hg push | 393 $ hg push |
394 pushing to $TESTTMP/t | 394 pushing to $TESTTMP/t (glob) |
395 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) | 395 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) |
396 no changes made to subrepo s since last push to $TESTTMP/t/s | 396 no changes made to subrepo s since last push to $TESTTMP/t/s |
397 no changes made to subrepo t since last push to $TESTTMP/t/t | 397 no changes made to subrepo t since last push to $TESTTMP/t/t |
398 searching for changes | 398 searching for changes |
399 no changes found | 399 no changes found |
400 [1] | 400 [1] |
401 $ echo foo >> s/a | 401 $ echo foo >> s/a |
402 $ hg push | 402 $ hg push |
403 pushing to $TESTTMP/t | 403 pushing to $TESTTMP/t (glob) |
404 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) | 404 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) |
405 no changes made to subrepo s since last push to $TESTTMP/t/s | 405 no changes made to subrepo s since last push to $TESTTMP/t/s |
406 no changes made to subrepo t since last push to $TESTTMP/t/t | 406 no changes made to subrepo t since last push to $TESTTMP/t/t |
407 searching for changes | 407 searching for changes |
408 no changes found | 408 no changes found |
413 committing into a subrepo makes its store (but not its parent's store) dirty | 413 committing into a subrepo makes its store (but not its parent's store) dirty |
414 | 414 |
415 $ echo foo >> s/ss/a | 415 $ echo foo >> s/ss/a |
416 $ hg -R s/ss commit -m 'test dirty store detection' | 416 $ hg -R s/ss commit -m 'test dirty store detection' |
417 $ hg push | 417 $ hg push |
418 pushing to $TESTTMP/t | 418 pushing to $TESTTMP/t (glob) |
419 pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) | 419 pushing subrepo s/ss to $TESTTMP/t/s/ss (glob) |
420 searching for changes | 420 searching for changes |
421 adding changesets | 421 adding changesets |
422 adding manifests | 422 adding manifests |
423 adding file changes | 423 adding file changes |
429 [1] | 429 [1] |
430 | 430 |
431 a subrepo store may be clean versus one repo but not versus another | 431 a subrepo store may be clean versus one repo but not versus another |
432 | 432 |
433 $ hg push | 433 $ hg push |
434 pushing to $TESTTMP/t | 434 pushing to $TESTTMP/t (glob) |
435 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) | 435 no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob) |
436 no changes made to subrepo s since last push to $TESTTMP/t/s | 436 no changes made to subrepo s since last push to $TESTTMP/t/s |
437 no changes made to subrepo t since last push to $TESTTMP/t/t | 437 no changes made to subrepo t since last push to $TESTTMP/t/t |
438 searching for changes | 438 searching for changes |
439 no changes found | 439 no changes found |
796 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 796 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
797 | 797 |
798 Try to push from the other side | 798 Try to push from the other side |
799 | 799 |
800 $ hg -R issue1852a push `pwd`/issue1852c | 800 $ hg -R issue1852a push `pwd`/issue1852c |
801 pushing to $TESTTMP/issue1852c | 801 pushing to $TESTTMP/issue1852c (glob) |
802 pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo (glob) | 802 pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo (glob) |
803 searching for changes | 803 searching for changes |
804 no changes found | 804 no changes found |
805 searching for changes | 805 searching for changes |
806 adding changesets | 806 adding changesets |