Show More
@@ -927,8 +927,8 b' def selectfile(afile_orig, bfile_orig, h' | |||||
927 | createfunc = hunk.createfile |
|
927 | createfunc = hunk.createfile | |
928 | missing = not goodb and not gooda and not createfunc() |
|
928 | missing = not goodb and not gooda and not createfunc() | |
929 |
|
929 | |||
930 |
# some diff programs apparently produce |
|
930 | # some diff programs apparently produce patches where the afile is | |
931 |
# |
|
931 | # not /dev/null, but afile starts with bfile | |
932 | abasedir = afile[:afile.rfind('/') + 1] |
|
932 | abasedir = afile[:afile.rfind('/') + 1] | |
933 | bbasedir = bfile[:bfile.rfind('/') + 1] |
|
933 | bbasedir = bfile[:bfile.rfind('/') + 1] | |
934 | if missing and abasedir == bbasedir and afile.startswith(bfile): |
|
934 | if missing and abasedir == bbasedir and afile.startswith(bfile): |
General Comments 0
You need to be logged in to leave comments.
Login now