Skip to content
Snippets Groups Projects
Commit 7a64931e authored by Maxim Dounin's avatar Maxim Dounin
Browse files

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.
parent 48c22c71
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment