Mercurial > public > mercurial-scm > hg-stable
diff mercurial/cmdutil.py @ 5487:7a64931e2d76
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 05 Nov 2007 20:05:44 +0300 |
| parents | 5517aa5aafb0 |
| children | 5a124ce4602a |
line wrap: on
line diff
--- a/mercurial/cmdutil.py Sat Nov 03 17:04:42 2007 +0100 +++ b/mercurial/cmdutil.py Mon Nov 05 20:05:44 2007 +0300 @@ -266,14 +266,15 @@ 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[abs] != 'r' and not util.lexists(target): + if repo.dirstate[abs] != 'r' and (not util.lexists(target) + or (os.path.isdir(target) and not os.path.islink(target))): remove.append(abs) mapping[abs] = rel, exact if repo.ui.verbose or not exact: repo.ui.status(_('removing %s\n') % ((pats and rel) or abs)) if not dry_run: + repo.remove(remove) repo.add(add) - repo.remove(remove) if similarity > 0: for old, new, score in findrenames(repo, add, remove, similarity): oldrel, oldexact = mapping[old]