Mercurial > hg
comparison tests/test-mq @ 6558:550c53d66949
merge from crew-stable
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Wed, 16 Apr 2008 16:07:15 +0200 |
| parents | 8c4cd80afd3e 3182602fa1fb |
| children | 25961e53a07f |
comparison
equal
deleted
inserted
replaced
| 6557:f2bd49752f0d | 6558:550c53d66949 |
|---|---|
| 503 echo a > a | 503 echo a > a |
| 504 hg qnew -f -e changea | 504 hg qnew -f -e changea |
| 505 hg qpop | 505 hg qpop |
| 506 hg qpush | 506 hg qpush |
| 507 cd .. | 507 cd .. |
| 508 | |
| 509 echo % test qpush with --force, issue1087 | |
| 510 hg init forcepush | |
| 511 cd forcepush | |
| 512 echo hello > hello.txt | |
| 513 echo bye > bye.txt | |
| 514 hg ci -Ama | |
| 515 hg qnew -d '0 0' empty | |
| 516 hg qpop | |
| 517 echo world >> hello.txt | |
| 518 | |
| 519 echo % qpush should fail, local changes | |
| 520 hg qpush | |
| 521 | |
| 522 echo % apply force, should not discard changes with empty patch | |
| 523 hg qpush -f | |
| 524 hg diff --config diff.nodates=True | |
| 525 hg qdiff --config diff.nodates=True | |
| 526 hg log -l1 -p | |
| 527 hg qref -d '0 0' | |
| 528 hg qpop | |
| 529 echo universe >> hello.txt | |
| 530 echo universe >> bye.txt | |
| 531 | |
| 532 echo % qpush should fail, local changes | |
| 533 hg qpush | |
| 534 | |
| 535 echo % apply force, should discard changes in hello, but not bye | |
| 536 hg qpush -f | |
| 537 hg st | |
| 538 hg diff --config diff.nodates=True | |
| 539 hg qdiff --config diff.nodates=True |