Mercurial > hg

changeset 4136:eb5d4fec1487

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix addremove for symlinks to non-existent files
author Giorgos Keramidas <keramida@ceid.upatras.gr>
date Fri, 05 Jan 2007 21:28:49 +0200
parents 6cb6cfe43c5d
children 26596a6b6518
files mercurial/cmdutil.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Sun Feb 18 20:39:25 2007 +0100
+++ b/mercurial/cmdutil.py	Fri Jan 05 21:28:49 2007 +0200
@@ -185,7 +185,8 @@
             mapping[abs] = rel, exact
             if repo.ui.verbose or not exact:
                 repo.ui.status(_('adding %s\n') % ((pats and rel) or abs))
-        if repo.dirstate.state(abs) != 'r' and not os.path.exists(rel):
+        islink = os.path.islink(rel)
+        if repo.dirstate.state(abs) != 'r' and not islink and not os.path.exists(rel):
             remove.append(abs)
             mapping[abs] = rel, exact
             if repo.ui.verbose or not exact: