Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-symlink-basic.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
abort: file .../test-symlink-basic/a/dangling not tracked! changeset: 0:cabd88b706fc tag: tip user: test date: Thu Jan 01 00:00:00 1970 +0000 files: dangling description: add symlink 2564acbe54bbbedfbf608479340b359f04597f80 644 @ dangling % rev 0: dangling -> nothing % rev 1: dangling -> void % modifying link dangling -> empty % reverting to rev 0: reverting dangling dangling -> nothing % backups: dangling.orig -> empty 1 files updated, 0 files merged, 0 files removed, 0 files unresolved % copies copying dangling to dangling2 A dangling2 dangling dangling -> void dangling2 -> void