Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-addremove-similar.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 | 8d982aef0be1 |
children |
line wrap: on
line source
adding empty-file adding large-file adding another-file removing empty-file removing large-file recording removal of large-file as rename to another-file (99% similar) % comparing two empty files caused ZeroDivisionError in the past 2 files updated, 0 files merged, 1 files removed, 0 files unresolved adding another-empty-file removing empty-file adding large-file adding tiny-file adding small-file removing large-file removing tiny-file recording removal of tiny-file as rename to small-file (82% similar) % should all fail abort: similarity must be a number abort: similarity must be between 0 and 100 abort: similarity must be between 0 and 100