Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-clone.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 | 76c4cadb49fc |
children |
rev | line source |
---|---|
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
550 | 2 a |
3 checking changesets | |
4 checking manifests | |
5 crosschecking files in changesets and manifests | |
6 checking files | |
7 1 files, 1 changesets, 1 total revisions | |
1926
ba198d17eea9
changes by John Levon to standardize some erroroutput
Peter van Dijk <peter@dataloss.nl>
parents:
925
diff
changeset
|
8 a not present |
550 | 9 checking changesets |
10 checking manifests | |
11 crosschecking files in changesets and manifests | |
12 checking files | |
13 1 files, 1 changesets, 1 total revisions | |
3841
aaeb7f5d1052
Show the destionation for clone if not specified manually.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2175
diff
changeset
|
14 destination directory: a |
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
15 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
550 | 16 a |
5239
76c4cadb49fc
clone: remove "file://" before making the path absolute
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3841
diff
changeset
|
17 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |