[PATCH STABLE] mq: fix failure in test-mq-qrefresh.t from f08df4d38442

[Adrian Buehlmann]

On 2010-11-26 04:54, Kevin Bullock wrote:
> # HG changeset patch
> # User Kevin Bullock <kbullock at ringworld.org>
> # Date 1290743441 21600
> # Branch stable
> # Node ID 5c0aacac8b6db56195bce767736e7d2fc9e0676f
> # Parent  f08df4d38442bf641859f3de860ce0e5b6ba7763
> mq: fix failing qrefresh test
> 
> Additions to test-mq-qrefresh.t in f08df4d38442 (mq: ignore subrepos
> (issue2499)) were originally based on a version prior to d0e21c5fde41
> (subrepo: handle missing subrepo spec file as removed). This fixes a
> test failure that resulted from the former being applied after the
> latter, noticed by abuehl.
> 
> diff --git a/tests/test-mq-qrefresh.t b/tests/test-mq-qrefresh.t
> --- a/tests/test-mq-qrefresh.t
> +++ b/tests/test-mq-qrefresh.t
> @@ -550,9 +550,7 @@
>    $ hg qrefresh
>    warning: not removing .hgsub
>    warning: not removing .hgsubstate
> -  refresh interrupted while patch was popped! (revert --all, qpush to recover)
> -  abort: No such file or directory: $TESTTMP/repo-2499/.hgsub
> -  [255]
> +  warning: subrepo spec file .hgsub not found
>    $ hg status
>    ! .hgsub
>    ! .hgsubstate

Thanks, passes both test-mq-qrefresh.t and test-check-code-hg.py on Ubuntu.