# HG changeset patch
# User Benoit Boissinot <benoit.boissinot@ens-lyon.org>
# Date 1208055951 14400
# Node ID c2c4fa9af016428ee4059e87b2887e5d59368b59
# Parent  4b92591c69a7911faea70dbe9d7a92b92b2b7bd3# Parent  ba0b2dacc6235daab2ee2a0223692ac4c5c617b7
merge with -stable

diff -r 4b92591c69a7 -r c2c4fa9af016 mercurial/patch.py
--- a/mercurial/patch.py	Sat Apr 12 20:51:26 2008 +0200
+++ b/mercurial/patch.py	Sat Apr 12 23:05:51 2008 -0400
@@ -789,7 +789,7 @@
         pathlen = len(path)
         i = 0
         if count == 0:
-            return path.rstrip()
+            return '', path.rstrip()
         while count > 0:
             i = path.find('/', i)
             if i == -1:
diff -r 4b92591c69a7 -r c2c4fa9af016 tests/test-import
--- a/tests/test-import	Sat Apr 12 20:51:26 2008 +0200
+++ b/tests/test-import	Sat Apr 12 23:05:51 2008 -0400
@@ -244,3 +244,20 @@
 # and a2 should have duplicated it
 cat a2
 cd ..
+
+echo % 'test -p0'
+hg init p0
+cd p0
+echo a > a
+hg ci -Am t
+hg import -p0 - << EOF
+foobar
+--- a	Sat Apr 12 22:43:58 2008 -0400
++++ a	Sat Apr 12 22:44:05 2008 -0400
+@@ -1,1 +1,1 @@
+-a
++bb
+EOF
+hg status
+cat a
+cd ..
diff -r 4b92591c69a7 -r c2c4fa9af016 tests/test-import.out
--- a/tests/test-import.out	Sat Apr 12 20:51:26 2008 +0200
+++ b/tests/test-import.out	Sat Apr 12 23:05:51 2008 -0400
@@ -256,3 +256,7 @@
 a
 % view a2
 a
+% test -p0
+adding a
+applying patch from stdin
+bb