Show More
@@ -512,7 +512,7 b' echo % qpush should fail, local changes' | |||||
512 | hg qpush |
|
512 | hg qpush | |
513 |
|
513 | |||
514 | echo % apply force, should not discard changes with empty patch |
|
514 | echo % apply force, should not discard changes with empty patch | |
515 | hg qpush -f |
|
515 | hg qpush -f 2>&1 | sed 's,^.*/patch,patch,g' | |
516 | hg diff --config diff.nodates=True |
|
516 | hg diff --config diff.nodates=True | |
517 | hg qdiff --config diff.nodates=True |
|
517 | hg qdiff --config diff.nodates=True | |
518 | hg log -l1 -p |
|
518 | hg log -l1 -p |
@@ -492,7 +492,7 b' Patch queue now empty' | |||||
492 | abort: local changes found, refresh first |
|
492 | abort: local changes found, refresh first | |
493 | % apply force, should not discard changes with empty patch |
|
493 | % apply force, should not discard changes with empty patch | |
494 | applying empty |
|
494 | applying empty | |
495 |
|
|
495 | patch: **** Only garbage was found in the patch input. | |
496 | patch failed, unable to continue (try -v) |
|
496 | patch failed, unable to continue (try -v) | |
497 | patch empty is empty |
|
497 | patch empty is empty | |
498 | Now at: empty |
|
498 | Now at: empty |
General Comments 0
You need to be logged in to leave comments.
Login now