Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-git-import.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 | 8feb33c2d153 |
children |
line wrap: on
line source
% new file applying patch from stdin % new empty file applying patch from stdin empty % chmod +x applying patch from stdin % copy applying patch from stdin a a % rename applying patch from stdin copyx empty new rename % delete applying patch from stdin empty new rename % regular diff applying patch from stdin % copy and modify applying patch from stdin a a b a a % rename and modify applying patch from stdin a a b c a % one file renamed multiple times applying patch from stdin 9 rename2 rename3 rename3-2 / rename3 (rename2)rename3-2 (rename2) rename3 rename3-2 a a b c a a a b c a % binary files and regular patch hunks applying patch from stdin foo 045c85ba38952325e126c70962cc0f9d9077bc67 644 binary % many binary files applying patch from stdin 045c85ba38952325e126c70962cc0f9d9077bc67 644 mbinary1 a874b471193996e7cb034bb301cac7bdaf3e3f46 644 mbinary2 % filenames with spaces applying patch from stdin foo % copy then modify the original file applying patch from stdin foo