# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1265987040 -3600
# Node ID 5a3a916aad58d63e70ef141f53ade3f7c4855407
# Parent  f8a9de664a1c6d349667922b534dd09e856418c7# Parent  452b6195e94c4d0f69924a44cc14237ea6a2907b
merge with crew

diff -r 452b6195e94c -r 5a3a916aad58 hgext/relink.py
--- a/hgext/relink.py	Fri Feb 12 15:46:48 2010 +0100
+++ b/hgext/relink.py	Fri Feb 12 16:04:00 2010 +0100
@@ -145,6 +145,8 @@
         except OSError, inst:
             ui.warn('%s: %s\n' % (tgt, str(inst)))
 
+    ui.progress(_('relink'), None, f, _(' files'), total)
+
     ui.status(_('relinked %d files (%d bytes reclaimed)\n') %
               (relinked, savedbytes))
 
diff -r 452b6195e94c -r 5a3a916aad58 mercurial/ui.py
--- a/mercurial/ui.py	Fri Feb 12 15:46:48 2010 +0100
+++ b/mercurial/ui.py	Fri Feb 12 16:04:00 2010 +0100
@@ -383,8 +383,10 @@
         revision, bytes, etc.), unit is a corresponding unit label,
         and total is the highest expected pos.
 
-        Multiple nested topics may be active at a time. All topics
-        should be marked closed by setting pos to None at termination.
+        Multiple nested topics may be active at a time.
+
+        All topics should be marked closed by setting pos to None at
+        termination.
         '''
 
         if pos == None or not self.debugflag:
diff -r 452b6195e94c -r 5a3a916aad58 mercurial/util.py
--- a/mercurial/util.py	Fri Feb 12 15:46:48 2010 +0100
+++ b/mercurial/util.py	Fri Feb 12 16:04:00 2010 +0100
@@ -1311,7 +1311,7 @@
 
 def rundetached(args, condfn):
     """Execute the argument list in a detached process.
-    
+
     condfn is a callable which is called repeatedly and should return
     True once the child process is known to have started successfully.
     At this point, the child process PID is returned. If the child
diff -r 452b6195e94c -r 5a3a916aad58 tests/test-subrepo-svn
--- a/tests/test-subrepo-svn	Fri Feb 12 15:46:48 2010 +0100
+++ b/tests/test-subrepo-svn	Fri Feb 12 16:04:00 2010 +0100
@@ -15,6 +15,7 @@
     escapedwd='/'$escapedwd
 fi
 filterpath="sed s|$escapedwd|/root|"
+filtersvn='s/ in transaction.*/ is out of date/;s/Out of date: /File /'
 
 echo % create subversion repo
 
@@ -79,12 +80,12 @@
 
 echo % this commit from hg will fail
 echo zzz >> s/alpha
-hg ci -m 'amend alpha from hg'
+hg ci -m 'amend alpha from hg' 2>&1 | sed "$filtersvn"
 svn revert -q s/alpha
 
 echo % this commit fails because of meta changes
 svn propset svn:mime-type 'text/html' s/alpha
-hg ci -m 'amend alpha from hg'
+hg ci -m 'amend alpha from hg' 2>&1 | sed "$filtersvn"
 svn revert -q s/alpha
 
 echo % this commit fails because of externals changes