Mercurial > hg > mercurial-crew-with-dirclash
changeset 614:6bff574d639f
Stop patch description import at diff -r
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Stop patch description import at diff -r
manifest hash: cc269f69c26ad4fba1fdaeefe2dc8191a0669fe0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCyZmyywK+sNU5EO8RAkODAJ9d/JYpBOZiOcQxlz0n2VtIPtK/IgCgl2Lj
caGbq4yn4RxzBQqqIoQzOTQ=
=9fHy
-----END PGP SIGNATURE-----
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Mon, 04 Jul 2005 12:18:58 -0800 |
parents | 5374955ec5b1 |
children | ad2999fad721 |
files | mercurial/commands.py |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/commands.py +++ b/mercurial/commands.py @@ -586,7 +586,7 @@ def import_(ui, repo, patch1, *patches, text = "" for l in file(pf): - if l[:4] == "--- ": break + if l.startswith("--- ") or l.startswith("diff -r"): break text += l # parse values that exist when importing the result of an hg export