Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-permissions.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 | 74723744d8e0 |
children |
rev | line source |
---|---|
1497 | 1 checking changesets |
2 checking manifests | |
3 crosschecking files in changesets and manifests | |
4 checking files | |
5 1 files, 1 changesets, 1 total revisions | |
6 checking changesets | |
7 checking manifests | |
8 crosschecking files in changesets and manifests | |
9 checking files | |
10 verify failed | |
11 checking changesets | |
12 checking manifests | |
13 crosschecking files in changesets and manifests | |
14 checking files | |
15 1 files, 1 changesets, 1 total revisions | |
16 commit failed | |
5219
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2152
diff
changeset
|
17 diff -r c1fab96507ef a |
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2152
diff
changeset
|
18 --- a/a |
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2152
diff
changeset
|
19 +++ b/a |
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2152
diff
changeset
|
20 @@ -1,1 +1,1 @@ foo |
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2152
diff
changeset
|
21 -foo |
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2152
diff
changeset
|
22 +barber |