[PATCH V2] subrepo: fix svnsubrepo.dirty() checking of ignoreupdate (issue2499)

Adrian Buehlmann adrian at cadifra.com
Fri Jan 7 12:12:46 CST 2011


On 2011-01-07 18:59, Adrian Buehlmann wrote:
> On 2011-01-07 17:48, Patrick Mézard wrote:
>> Le 04/01/11 19:14, Kevin Bullock a écrit :
>>> # HG changeset patch
>>> # User Kevin Bullock <kbullock at ringworld.org>
>>> # Date 1294162427 21600
>>> # Node ID 1553989d89cb9d0993aa524d1b1f50a859b1e916
>>> # Parent  eafa47a2765a83372dea3dcaccb66687fa8f7248
>>> subrepo: fix svnsubrepo.dirty() checking of ignoreupdate (issue2499)
>>>
>>> The ignoreupdate flag to subrepo.dirty(), introduced in be7e8e9bc5e5, is
>>> correctly checked with this change.
>>
>> In crew as http://hg.intevation.org/mercurial/crew/rev/a8cef95cea88
>>
>> I have just fixed quoting in the test tr call.
>>
>> Thanks!
> 
> Fails on Ubuntu here:
> 
> ERROR: /home/adi/hgrepos/hg-crew/tests/test-mq-subrepo.t output changed
> --- /home/adi/hgrepos/hg-crew/tests/test-mq-subrepo.t
> +++ /home/adi/hgrepos/hg-crew/tests/test-mq-subrepo.t.err
> @@ -350,6 +350,8 @@
>  handle svn subrepos safely
> 
>    $ svnadmin create svn-repo-2499
> +  /tmp/tmpWtBd4vhg-tst: 186: svnadmin: not found
> +  [127]

Probably needs (similar to test-convert-svn-branches.t):

diff --git a/tests/test-mq-subrepo.t b/tests/test-mq-subrepo.t
--- a/tests/test-mq-subrepo.t
+++ b/tests/test-mq-subrepo.t
@@ -1,3 +1,5 @@
+  $ "$TESTDIR/hghave" svn || exit 80
+
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "mq=" >> $HGRCPATH
   $ echo "record=" >> $HGRCPATH


adi at ubuntu1:~/hgrepos/hg-crew/tests$ python run-tests.py test-mq-subrepo.t 
s
Skipped test-mq-subrepo.t: missing feature: subversion client and admin tools
# Ran 1 tests, 1 skipped, 0 failed.


More information about the Mercurial-devel mailing list