Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-confused-revert.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 | 25857e00af8e |
children |
line wrap: on
line source
%%% should show a removed and b added A b R a reverting... undeleting a forgetting b %%% should show b unknown and a back to normal ? b 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging a 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) %%% should show foo-b foo-b %%% should show a removed and b added A b R a %%% revert should fail abort: uncommitted merge - please provide a specific revision %%% revert should be ok now undeleting a forgetting b %%% should show b unknown and a marked modified (merged) ? b %%% should show foo-b foo-b