##// END OF EJS Templates
fix import with -p0
Benoit Boissinot -
r6520:ba0b2dac default
parent child Browse files
Show More
@@ -789,7 +789,7 b' def selectfile(afile_orig, bfile_orig, h'
789 pathlen = len(path)
789 pathlen = len(path)
790 i = 0
790 i = 0
791 if count == 0:
791 if count == 0:
792 return path.rstrip()
792 return '', path.rstrip()
793 while count > 0:
793 while count > 0:
794 i = path.find('/', i)
794 i = path.find('/', i)
795 if i == -1:
795 if i == -1:
@@ -244,3 +244,20 b' echo % view a2'
244 # and a2 should have duplicated it
244 # and a2 should have duplicated it
245 cat a2
245 cat a2
246 cd ..
246 cd ..
247
248 echo % 'test -p0'
249 hg init p0
250 cd p0
251 echo a > a
252 hg ci -Am t
253 hg import -p0 - << EOF
254 foobar
255 --- a Sat Apr 12 22:43:58 2008 -0400
256 +++ a Sat Apr 12 22:44:05 2008 -0400
257 @@ -1,1 +1,1 @@
258 -a
259 +bb
260 EOF
261 hg status
262 cat a
263 cd ..
@@ -256,3 +256,7 b' applying copy.diff'
256 a
256 a
257 % view a2
257 % view a2
258 a
258 a
259 % test -p0
260 adding a
261 applying patch from stdin
262 bb
General Comments 0
You need to be logged in to leave comments. Login now