annotate tests/test-debugindexdot @ 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 |
8838fe5a236f |
| children |
|
| rev |
line source |
|
5348
|
1 #!/bin/sh
|
|
|
2
|
|
|
3 # Just exercize debugindexdot
|
|
|
4 # Create a short file history including a merge.
|
|
|
5 hg init t
|
|
|
6 cd t
|
|
|
7 echo a > a
|
|
|
8 hg ci -qAm t1 -d '0 0'
|
|
|
9 echo a >> a
|
|
|
10 hg ci -m t2 -d '1 0'
|
|
|
11 hg up -qC 0
|
|
|
12 echo b >> a
|
|
|
13 hg ci -m t3 -d '2 0'
|
|
|
14 HGMERGE=true hg merge -q
|
|
|
15 hg ci -m merge -d '3 0'
|
|
|
16
|
|
|
17 hg debugindexdot .hg/store/data/a.i
|
