Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-empty-dir.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 |
---|---|
578 | 1 321 |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
1926
diff
changeset
|
2 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
1926
ba198d17eea9
changes by John Levon to standardize some erroroutput
Peter van Dijk <peter@dataloss.nl>
parents:
925
diff
changeset
|
3 sub/b not present |
ba198d17eea9
changes by John Levon to standardize some erroroutput
Peter van Dijk <peter@dataloss.nl>
parents:
925
diff
changeset
|
4 sub not present |