##// END OF EJS Templates
update: fix bug when update tries to modify folder symlink...
Kostia Balytskyi -
r29629:b33c0c38 stable
parent child Browse files
Show More
@@ -1082,7 +1082,7 b' def batchget(repo, mctx, actions):'
1082 1082 if e.errno != errno.ENOENT:
1083 1083 raise
1084 1084
1085 if repo.wvfs.isdir(f):
1085 if repo.wvfs.isdir(f) and not repo.wvfs.islink(f):
1086 1086 repo.wvfs.removedirs(f)
1087 1087 wwrite(f, fctx(f).data(), flags, backgroundclose=True)
1088 1088 if i == 100:
@@ -53,3 +53,22 b' make sure that this does not erase untra'
53 53 abort: *: '$TESTTMP/r1/r2/name' (glob)
54 54 [255]
55 55 $ cd ..
56
57 #if symlink
58
59 Test update when two commits have symlinks that point to different folders
60 $ hg init r3 && cd r3
61 $ echo root > root && hg ci -Am root
62 adding root
63 $ mkdir folder1 && mkdir folder2
64 $ ln -s folder1 folder
65 $ hg ci -Am "symlink to folder1"
66 adding folder
67 $ rm folder
68 $ ln -s folder2 folder
69 $ hg ci -Am "symlink to folder2"
70 $ hg up 1
71 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
72 $ cd ..
73
74 #endif
General Comments 0
You need to be logged in to leave comments. Login now