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

[Adrian Buehlmann]

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]
   $ curpath=`pwd | tr '\\\\' /`
   $ expr "$svnpath" : "\/" > /dev/null
   > if [ $? -ne 0 ]; then
@@ -358,29 +360,35 @@
   $ svnurl="file://$curpath/svn-repo-2499/project"
   $ mkdir -p svn-project-2499/trunk
   $ svn import -m 'init project' svn-project-2499 "$svnurl"
-  Adding         svn-project-2499/trunk
-
-  Committed revision 1.
+  /tmp/tmpWtBd4vhg-tst: 199: svn: not found
+  [127]

 qnew on repo w/svn subrepo
   $ mkrepo repo-2499-svn-subrepo
   $ svn co "$svnurl"/trunk sub
-  Checked out revision 1.
+  /tmp/tmpWtBd4vhg-tst: 203: svn: not found
+  [127]
   $ echo 'sub = [svn]sub' >> .hgsub
   $ hg add .hgsub
   $ hg status -S
   A .hgsub
-  ? sub/.svn/entries
   $ hg qnew -m0 0.diff
-  committing subrepository sub
+  abort: No such file or directory
+  [255]
   $ cd sub
+  cd: 213: can't cd to sub
+  [2]
   $ echo a > a
   $ svn add a
-  A         a
+  /tmp/tmpWtBd4vhg-tst: 217: svn: not found
+  [127]
   $ svn st
-  A       a
+  /tmp/tmpWtBd4vhg-tst: 219: svn: not found
+  [127]
   $ cd ..
   $ hg status -S        # doesn't show status for svn subrepos (yet)
+  abort: There is no Mercurial repository here (.hg not found)!
+  [255]
   $ hg qnew -m1 1.diff
-  abort: uncommitted changes in subrepository sub
-  [255]
+  abort: There is no Mercurial repository here (.hg not found)!
+  [255]