Mercurial > public > mercurial-scm > hg-stable

diff mercurial/patch.py @ 15159:85322c19c831

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 27 Sep 2011 18:50:18 -0500
parents bfe903b1ff4e 7ce7177e029a
children 2c4fdee4d1a8
line wrap: on
line diff
--- a/mercurial/patch.py	Thu Sep 22 01:51:36 2011 +0200
+++ b/mercurial/patch.py	Tue Sep 27 18:50:18 2011 -0500
@@ -188,7 +188,7 @@
                 pend = subject.find(']')
                 if pend >= 0:
                     subject = subject[pend + 1:].lstrip()
-            subject = subject.replace('\n\t', ' ')
+            subject = re.sub(r'\n[ \t]+', ' ', subject)
             ui.debug('Subject: %s\n' % subject)
         if user:
             ui.debug('From: %s\n' % user)