Mercurial > hg
changeset 17915:fb14a5dcdc62
Merge with stable
| author | Bryan O'Sullivan <bryano@fb.com> |
|---|---|
| date | Wed, 07 Nov 2012 09:59:46 -0800 |
| parents | d8ad046ea4e5 (current diff) ce2c709a8e90 (diff) |
| children | ed225834b372 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-mq-qrefresh.t Tue Nov 06 16:49:54 2012 -0800 +++ b/tests/test-mq-qrefresh.t Wed Nov 07 09:59:46 2012 -0800 @@ -208,7 +208,7 @@ $ echo 'orphan' > orphanchild $ hg add orphanchild $ hg qrefresh nonexistentfilename # clear patch - nonexistentfilename: No such file or directory + nonexistentfilename: * (glob) $ hg qrefresh --short 1/base $ hg qrefresh --short 2/base
--- a/tests/test-subrepo.t Tue Nov 06 16:49:54 2012 -0800 +++ b/tests/test-subrepo.t Wed Nov 07 09:59:46 2012 -0800 @@ -606,7 +606,7 @@ issue3276_ok $ rm repo/s/b $ hg -R repo revert --all - reverting repo/.hgsubstate + reverting repo/.hgsubstate (glob) reverting subrepo s $ hg -R repo update 1 files updated, 0 files merged, 0 files removed, 0 files unresolved