# HG changeset patch
# User Dirkjan Ochtman <dirkjan@ochtman.nl>
# Date 1224507476 -7200
# Node ID 1f07e2e86974f8bf03706d9c40833b2eb687fd23
# Parent  380fda3eed13fccf29bd293d4aff953fc60a7b14# Parent  a79d3f5358097392957b038eebacf9eb7565e220
merge with crew-stable

diff -r a79d3f535809 -r 1f07e2e86974 hgext/convert/subversion.py
--- a/hgext/convert/subversion.py	Mon Oct 20 14:53:53 2008 +0200
+++ b/hgext/convert/subversion.py	Mon Oct 20 14:57:56 2008 +0200
@@ -280,7 +280,7 @@
         # Check if branches bring a few more heads to the list
         if branches:
             rpath = self.url.strip('/')
-            branchnames = svn.client.ls(rpath + '/' + urllib.quote(branches), 
+            branchnames = svn.client.ls(rpath + '/' + urllib.quote(branches),
                                         rev, False, self.ctx)
             for branch in branchnames.keys():
                 module = '%s/%s/%s' % (oldmodule, branches, branch)
@@ -325,7 +325,7 @@
         else:
             # Perform a full checkout on roots
             uuid, module, revnum = self.revsplit(rev)
-            entries = svn.client.ls(self.baseurl + urllib.quote(module), 
+            entries = svn.client.ls(self.baseurl + urllib.quote(module),
                                     optrev(revnum), True, self.ctx)
             files = [n for n,e in entries.iteritems()
                      if e.kind == svn.core.svn_node_file]
@@ -874,7 +874,7 @@
         path = path.strip('/')
         pool = Pool()
         rpath = '/'.join([self.baseurl, urllib.quote(path)]).strip('/')
-        return ['%s/%s' % (path, x) for x in 
+        return ['%s/%s' % (path, x) for x in
                 svn.client.ls(rpath, optrev(revnum), True, self.ctx, pool).keys()]
 
     def getrelpath(self, path, module=None):
diff -r a79d3f535809 -r 1f07e2e86974 mercurial/commands.py
--- a/mercurial/commands.py	Mon Oct 20 14:53:53 2008 +0200
+++ b/mercurial/commands.py	Mon Oct 20 14:57:56 2008 +0200
@@ -270,7 +270,7 @@
     Once you have performed tests, mark the working directory as bad
     or good and bisect will either update to another candidate changeset
     or announce that it has found the bad revision.
-    
+
     As a shortcut, you can also use the revision argument to mark a
     revision as good or bad without checking it out first.
     """
diff -r a79d3f535809 -r 1f07e2e86974 mercurial/strutil.py
--- a/mercurial/strutil.py	Mon Oct 20 14:53:53 2008 +0200
+++ b/mercurial/strutil.py	Mon Oct 20 14:57:56 2008 +0200
@@ -37,5 +37,5 @@
     try:
         return s.rsplit(sep, maxsplit)
     except AttributeError:
-        return  [chunk[::-1] for chunk in 
+        return  [chunk[::-1] for chunk in
                  s[::-1].split(sep, maxsplit)[::-1]]
diff -r a79d3f535809 -r 1f07e2e86974 tests/test-doctest.py
--- a/tests/test-doctest.py	Mon Oct 20 14:53:53 2008 +0200
+++ b/tests/test-doctest.py	Mon Oct 20 14:57:56 2008 +0200
@@ -1,7 +1,7 @@
 # this is hack to make sure no escape characters are inserted into the output
 import os;
 if 'TERM' in os.environ:
-    del os.environ['TERM'] 
+    del os.environ['TERM']
 import doctest
 
 import mercurial.changelog