Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-non-interactive-wsgi.out @ 5483:0c43f87baba3 default tip
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 | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | 8c5ef3b87cb1 |
children |
line wrap: on
line source
changeset: 0:61c9426e69fe tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 summary: test ---- HEADERS 200 Script output follows ---- DATA [('content-type', 'text/html; charset=ascii')] ---- ERRORS