Mercurial > hg
comparison tests/test-mq @ 6554:3182602fa1fb
mq: don't commit local changes on pushing empty patch (issue1087)
| author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
|---|---|
| date | Wed, 16 Apr 2008 16:04:07 +0200 |
| parents | 9db24a36d182 |
| children | 550c53d66949 0ada66dcc259 |
comparison
equal
deleted
inserted
replaced
| 6553:0bb76d168437 | 6554:3182602fa1fb |
|---|---|
| 495 echo a > a | 495 echo a > a |
| 496 hg qnew -f -e changea | 496 hg qnew -f -e changea |
| 497 hg qpop | 497 hg qpop |
| 498 hg qpush | 498 hg qpush |
| 499 cd .. | 499 cd .. |
| 500 | |
| 501 echo % test qpush with --force, issue1087 | |
| 502 hg init forcepush | |
| 503 cd forcepush | |
| 504 echo hello > hello.txt | |
| 505 echo bye > bye.txt | |
| 506 hg ci -Ama | |
| 507 hg qnew -d '0 0' empty | |
| 508 hg qpop | |
| 509 echo world >> hello.txt | |
| 510 | |
| 511 echo % qpush should fail, local changes | |
| 512 hg qpush | |
| 513 | |
| 514 echo % apply force, should not discard changes with empty patch | |
| 515 hg qpush -f | |
| 516 hg diff --config diff.nodates=True | |
| 517 hg qdiff --config diff.nodates=True | |
| 518 hg log -l1 -p | |
| 519 hg qref -d '0 0' | |
| 520 hg qpop | |
| 521 echo universe >> hello.txt | |
| 522 echo universe >> bye.txt | |
| 523 | |
| 524 echo % qpush should fail, local changes | |
| 525 hg qpush | |
| 526 | |
| 527 echo % apply force, should discard changes in hello, but not bye | |
| 528 hg qpush -f | |
| 529 hg st | |
| 530 hg diff --config diff.nodates=True | |
| 531 hg qdiff --config diff.nodates=True |