Mercurial > hg

comparison tests/test-mq.out @ 7048:25961e53a07f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with -stable
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Mon, 22 Sep 2008 14:47:21 +0200
parents 3fffba1c87d0 0ada66dcc259
children 4a1ac535be1d
comparison
equal deleted inserted replaced
7047:277c91fe8384 7048:25961e53a07f
498 Patch queue now empty 498 Patch queue now empty
499 % qpush should fail, local changes 499 % qpush should fail, local changes
500 abort: local changes found, refresh first 500 abort: local changes found, refresh first
501 % apply force, should not discard changes with empty patch 501 % apply force, should not discard changes with empty patch
502 applying empty 502 applying empty
503 /usr/bin/patch: **** Only garbage was found in the patch input. 503 patch: **** Only garbage was found in the patch input.
504 patch failed, unable to continue (try -v) 504 patch failed, unable to continue (try -v)
505 patch empty is empty 505 patch empty is empty
506 Now at: empty 506 Now at: empty
507 diff -r bf5fc3f07a0a hello.txt 507 diff -r bf5fc3f07a0a hello.txt
508 --- a/hello.txt 508 --- a/hello.txt