# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2005-07-04 20:18:58
# Node ID 6bff574d639f9df1cd19b731d6b192256f3ec73c
# Parent  5374955ec5b1329554f5b5af95eacad2b9419916

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-----


diff --git a/mercurial/commands.py b/mercurial/commands.py
--- 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