Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-nested-repo.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 | c7e8fe11f34a |
| children |
| rev | line source |
|---|---|
|
2061
5987c1eac2ce
support nested repositories.
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
1 # should print nothing |
|
5141
d316124ebbea
Make audit_path more stringent.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2139
diff
changeset
|
2 # should fail |
|
d316124ebbea
Make audit_path more stringent.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2139
diff
changeset
|
3 abort: path 'b/x' is inside repo 'b' |
|
d316124ebbea
Make audit_path more stringent.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2139
diff
changeset
|
4 abort: path 'b/x' is inside repo 'b' |
|
5200
c7e8fe11f34a
path_auditor: cache names of audited directories
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5141
diff
changeset
|
5 # should fail |
|
c7e8fe11f34a
path_auditor: cache names of audited directories
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5141
diff
changeset
|
6 abort: path 'b/x' is inside repo 'b' |
|
5141
d316124ebbea
Make audit_path more stringent.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2139
diff
changeset
|
7 # should arguably print nothing |
|
d316124ebbea
Make audit_path more stringent.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2139
diff
changeset
|
8 # should fail |
|
d316124ebbea
Make audit_path more stringent.
Bryan O'Sullivan <bos@serpentine.com>
parents:
2139
diff
changeset
|
9 abort: path 'b/a' is inside repo 'b' |