Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-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 |
rev | line source |
---|---|
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
981
diff
changeset
|
1 changeset: 0:0acdaf898367 |
388
398737777644
Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
382
diff
changeset
|
2 tag: tip |
331 | 3 user: test |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
981
diff
changeset
|
4 date: Mon Jan 12 13:46:40 1970 +0000 |
331 | 5 summary: test |
6 | |
5405
8feb33c2d153
Display symlink or executable bit with manifest -v
Patrick Mezard <pmezard@gmail.com>
parents:
2152
diff
changeset
|
7 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a |
331 | 8 a |
9 checking changesets | |
10 checking manifests | |
11 crosschecking files in changesets and manifests | |
12 checking files | |
13 1 files, 1 changesets, 1 total revisions |