Mercurial > hg
diff mercurial/util.h @ 19157:113681bbef9e
manifestmerge: local unknown, remote created: don't traverse symlinks
To figure out what to do with locally unknown files, Mercurial attempts to read
them if they exist. When an attempt is made to read a file that exists but
traverses a symlink, Mercurial aborts.
With this patch, we first ensure that the file doesn't traverse a symlink
before opening it. This is fine because a file being "remote created" means the
symlink doesn't exist remotely, which means it will be deleted in the apply
phase.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 08 May 2013 14:11:01 -0700 |
parents | 9535a0dc41f2 |
children | 7999f4fa155a |