Mercurial > hg
changeset 16595:2de6ac4ac17c stable
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 | 5516fdf3fe24 |
| children | 95ca6c8b38da |
| files | mercurial/subrepo.py tests/test-subrepo-missing.t |
| diffstat | 2 files changed, 10 insertions(+), 0 deletions(-) [+] |
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:
--- a/tests/test-subrepo-missing.t Fri May 04 14:36:40 2012 -0400 +++ b/tests/test-subrepo-missing.t Fri May 04 14:19:52 2012 +0200 @@ -12,6 +12,13 @@ adding b $ hg ci -m updatedsub +ignore blanklines in .hgsubstate + + >>> file('.hgsubstate', 'wb').write('\n\n \t \n \n') + $ hg st --subrepos + M .hgsubstate + $ hg revert -qC .hgsubstate + delete .hgsub and revert it $ rm .hgsub