##// END OF EJS Templates
patch: do not overwrite broken untracked symlinks
Patrick Mezard -
r12341:aca8b10b stable
parent child Browse files
Show More
@@ -25,7 +25,7 b' class NoHunks(PatchError):'
25
25
26 def copyfile(src, dst, basedir):
26 def copyfile(src, dst, basedir):
27 abssrc, absdst = [util.canonpath(basedir, basedir, x) for x in [src, dst]]
27 abssrc, absdst = [util.canonpath(basedir, basedir, x) for x in [src, dst]]
28 if os.path.exists(absdst):
28 if os.path.lexists(absdst):
29 raise util.Abort(_("cannot create %s: destination already exists") %
29 raise util.Abort(_("cannot create %s: destination already exists") %
30 dst)
30 dst)
31
31
@@ -35,3 +35,10 b' now at: link'
35 applying movelink
35 applying movelink
36 now at: movelink
36 now at: movelink
37 linkb -> linkb
37 linkb -> linkb
38 % check patch does not overwrite untracked symlinks
39 popping movelink
40 now at: link
41 applying movelink
42 patch failed, unable to continue (try -v)
43 patch failed, rejects left in working dir
44 errors during apply, please fix and refresh movelink
General Comments 0
You need to be logged in to leave comments. Login now