tests/test-debugindexdot
author Mads Kiilerich <mads@kiilerich.com>
Tue, 10 Feb 2009 22:47:38 +0100
changeset 7785 660c8dd44060
parent 5346 8838fe5a236f
permissions -rwxr-xr-x
test-merge-tool: Make sure no hgmerge can be found in $PATH The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH before it falls back to use internal merge. This fixes the test for this fallback to be tolerant to existing hgmerges.

#!/bin/sh

# Just exercize debugindexdot
# Create a short file history including a merge.
hg init t
cd t
echo a > a
hg ci -qAm t1 -d '0 0'
echo a >> a
hg ci -m t2 -d '1 0'
hg up -qC 0
echo b >> a
hg ci -m t3 -d '2 0'
HGMERGE=true hg merge -q
hg ci -m merge -d '3 0'

hg debugindexdot .hg/store/data/a.i