Mercurial > hg-stable
changeset 3334:534806df5b5a
Test case for bdiff on buffer objects
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Wed, 11 Oct 2006 12:02:06 -0700 |
| parents | 8ec80c1b8f0b |
| children | 9061613c1593 |
| files | tests/test-mq tests/test-mq.out |
| diffstat | 2 files changed, 19 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-mq Wed Oct 11 11:30:59 2006 -0700 +++ b/tests/test-mq Wed Oct 11 12:02:06 2006 -0700 @@ -160,6 +160,17 @@ -e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" ../.hg/patches/foo hg status +echo % qpush failure +cd .. +hg qrefresh +hg qnew -mbar bar +echo foo > foo +hg add foo +hg qrefresh +hg qpop -a +echo bar > foo +hg qpush -a + cat >>$HGRCPATH <<EOF [diff] git = True
--- a/tests/test-mq.out Wed Oct 11 11:30:59 2006 -0700 +++ b/tests/test-mq.out Wed Oct 11 12:02:06 2006 -0700 @@ -164,6 +164,14 @@ @@ -0,0 +1,1 @@ +f M a +% qpush failure +Patch queue now empty +applying foo +applying bar +1 out of 1 hunk ignored -- saving rejects to file foo.rej +patch failed, unable to continue (try -v) +patch failed, rejects left in working dir +Errors during apply, please fix and refresh bar new file diff --git a/new b/new