Mercurial > public > mercurial-scm > hg

diff mercurial/subrepo.py @ 16595:2de6ac4ac17c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: ignore blank lines in .hgsubstate (issue3424) Reported by Sebastian Krysmanski <infomail@lordb.de>
author Patrick Mezard <patrick@mezard.eu>
date Fri, 04 May 2012 14:19:52 +0200
parents 4955e7bf085c
children 95ca6c8b38da
line wrap: on
line diff
--- a/mercurial/subrepo.py	Fri May 04 14:36:40 2012 -0400
+++ b/mercurial/subrepo.py	Fri May 04 14:19:52 2012 +0200
@@ -44,6 +44,9 @@
     if '.hgsubstate' in ctx:
         try:
             for l in ctx['.hgsubstate'].data().splitlines():
+                l = l.lstrip()
+                if not l:
+                    continue
                 revision, path = l.split(" ", 1)
                 rev[path] = revision
         except IOError, err: