# HG changeset patch # User Martin von Zweigbergk # Date 1414108838 25200 # Node ID 18168938e1c12d95e1b208caffbf1c79f0cf9f19 # Parent dd610f1d46c90df5e9d7791c9dee408755237682 context.status: only filter suspect symlinks in the dirstate status We don't care about filtering out symlinks that have already been committed with full content, only those that have been accidentally resolved in the working directory. diff -r dd610f1d46c9 -r 18168938e1c1 mercurial/context.py --- a/mercurial/context.py Thu Oct 23 16:19:56 2014 -0700 +++ b/mercurial/context.py Thu Oct 23 17:00:38 2014 -0700 @@ -1424,14 +1424,14 @@ against its parent (repo['.']). """ s = self._dirstatestatus(match, listignored, listclean, listunknown) + # Filter out symlinks that, in the case of FAT32 and NTFS filesytems, + # might have accidentally ended up with the entire contents of the file + # they are susposed to be linking to. + s[0] = self._filtersuspectsymlink(s[0]) if other != self._repo['.']: s = super(workingctx, self)._buildstatus(other, s, match, listignored, listclean, listunknown) - # Filter out symlinks that, in the case of FAT32 and NTFS filesytems, - # might have accidentally ended up with the entire contents of the file - # they are susposed to be linking to. - s[0] = self._filtersuspectsymlink(s[0]) self._status = scmutil.status(*s) return s