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.

     1

200 Script output follows

     2

content-type: text/plain

     3

content-length: 157

     4

content-disposition: filename=sometext.txt

     5

     6

This is just some random text

     7

that will go inside the file and take a few lines.

     8

It is very boring to read, but computers don't

     9

care about things like that.

    10

host - - [date] "GET /?f=f165dc289438;file=sometext.txt;style=raw HTTP/1.1" 200 -