tests/test-debugindexdot
author Bryan O'Sullivan <bos@serpentine.com>
Fri, 02 Nov 2007 14:02:28 -0700
changeset 5503 6f26c7677463
parent 5346 8838fe5a236f
permissions -rwxr-xr-x
Test a merge of a symlink against an executable file. This should result in a conflict, but the symlink always wins.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5346
8838fe5a236f Test debugindexdot
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     1
#!/bin/sh
8838fe5a236f Test debugindexdot
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     2
8838fe5a236f Test debugindexdot
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     3
# Just exercize debugindexdot
8838fe5a236f Test debugindexdot
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     4
# Create a short file history including a merge.
8838fe5a236f Test debugindexdot
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     5
hg init t
8838fe5a236f Test debugindexdot
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     6
cd t
8838fe5a236f Test debugindexdot
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     7
echo a > a
8838fe5a236f Test debugindexdot
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     8
hg ci -qAm t1 -d '0 0'
8838fe5a236f Test debugindexdot
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
     9
echo a >> a
8838fe5a236f Test debugindexdot
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    10
hg ci -m t2 -d '1 0'
8838fe5a236f Test debugindexdot
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    11
hg up -qC 0
8838fe5a236f Test debugindexdot
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    12
echo b >> a
8838fe5a236f Test debugindexdot
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    13
hg ci -m t3 -d '2 0'
8838fe5a236f Test debugindexdot
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    14
HGMERGE=true hg merge -q
8838fe5a236f Test debugindexdot
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    15
hg ci -m merge -d '3 0'
8838fe5a236f Test debugindexdot
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    16
8838fe5a236f Test debugindexdot
Patrick Mezard <pmezard@gmail.com>
parents:
diff changeset
    17
hg debugindexdot .hg/store/data/a.i