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.
quiet:
--- a/foo Mon Jan 12 13:46:40 1970 +0000
+++ b/foo Mon Jan 12 13:46:41 1970 +0000
@@ -1,1 +1,1 @@ bar
-bar
+foobar
normal:
diff -r 74de3f1392e2 -r b8b5f023a6ad foo
--- a/foo Mon Jan 12 13:46:40 1970 +0000
+++ b/foo Mon Jan 12 13:46:41 1970 +0000
@@ -1,1 +1,1 @@ bar
-bar
+foobar
verbose:
diff -r 74de3f1392e2 -r b8b5f023a6ad foo
--- a/foo Mon Jan 12 13:46:40 1970 +0000
+++ b/foo Mon Jan 12 13:46:41 1970 +0000
@@ -1,1 +1,1 @@ bar
-bar
+foobar
debug:
diff -r 74de3f1392e2d67856fb155963441f2610494e1a -r b8b5f023a6ad77fc378bd95cf3fa00cd1414d107 foo
--- a/foo Mon Jan 12 13:46:40 1970 +0000
+++ b/foo Mon Jan 12 13:46:41 1970 +0000
@@ -1,1 +1,1 @@ bar
-bar
+foobar