Mercurial > hg
diff tests/test-mq-qpush-fail.t @ 26780:bbf544b5f2e9
mq: consistently use qrefresh
author | timeless@mozdev.org |
---|---|
date | Wed, 14 Oct 2015 03:30:27 -0400 |
parents | 30657909b2ba |
children | 263edb591b72 |
line wrap: on
line diff
--- a/tests/test-mq-qpush-fail.t Wed Oct 14 02:06:54 2015 -0400 +++ b/tests/test-mq-qpush-fail.t Wed Oct 14 03:30:27 2015 -0400 @@ -233,22 +233,22 @@ [255] $ echo a >> a $ hg qpop --keep-changes - abort: local changes found, refresh first + abort: local changes found, qrefresh first [255] $ hg revert -qa a $ rm a $ hg qpop --keep-changes - abort: local changes found, refresh first + abort: local changes found, qrefresh first [255] $ hg rm -A a $ hg qpop --keep-changes - abort: local changes found, refresh first + abort: local changes found, qrefresh first [255] $ hg revert -qa a $ echo b > b $ hg add b $ hg qpop --keep-changes - abort: local changes found, refresh first + abort: local changes found, qrefresh first [255] $ hg forget b $ echo d > d @@ -303,7 +303,7 @@ committing manifest committing changelog patch failed, rejects left in working directory - errors during apply, please fix and refresh p3 + errors during apply, please fix and qrefresh p3 [2] $ cat a.orig a @@ -449,7 +449,7 @@ now at: p2 $ hg st b $ hg --config mq.keepchanges=1 qpush --exact - abort: local changes found, refresh first + abort: local changes found, qrefresh first [255] $ hg revert -qa a $ hg qpop