Show More
@@ -0,0 +1,16 b'' | |||||
|
1 | #!/bin/sh | |||
|
2 | "$TESTDIR/hghave" symlink || exit 80 | |||
|
3 | ||||
|
4 | rm -rf a | |||
|
5 | hg init a | |||
|
6 | cd a | |||
|
7 | ||||
|
8 | ln -s foo link | |||
|
9 | hg add link | |||
|
10 | hg ci -mbad link | |||
|
11 | hg rm link | |||
|
12 | hg ci -mok | |||
|
13 | hg diff -g -r 0:1 > bad.patch | |||
|
14 | hg up 0 | |||
|
15 | hg import --no-commit bad.patch | |||
|
16 | hg st |
@@ -0,0 +1,4 b'' | |||||
|
1 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
2 | applying bad.patch | |||
|
3 | R link | |||
|
4 | ? bad.patch |
@@ -751,7 +751,7 b' def selectfile(afile_orig, bfile_orig, h' | |||||
751 | nulla = afile_orig == "/dev/null" |
|
751 | nulla = afile_orig == "/dev/null" | |
752 | nullb = bfile_orig == "/dev/null" |
|
752 | nullb = bfile_orig == "/dev/null" | |
753 | abase, afile = pathstrip(afile_orig, strip) |
|
753 | abase, afile = pathstrip(afile_orig, strip) | |
754 |
gooda = not nulla and |
|
754 | gooda = not nulla and util.lexists(afile) | |
755 | bbase, bfile = pathstrip(bfile_orig, strip) |
|
755 | bbase, bfile = pathstrip(bfile_orig, strip) | |
756 | if afile == bfile: |
|
756 | if afile == bfile: | |
757 | goodb = gooda |
|
757 | goodb = gooda |
General Comments 0
You need to be logged in to leave comments.
Login now