Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-encode.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 | b2ae81a7df29 |
children |
rev | line source |
---|---|
1258 | 1 %% no changes |
2 %% no changes | |
3 %% uncompressed contents in repo | |
4 this is a test | |
5 %% uncompress our working dir copy | |
6 this is a test | |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1258
diff
changeset
|
7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1258 | 8 %% uncompress our new working dir copy |
9 this is a test |