Mercurial > hg
view tests/test-debugindexdot @ 7821:9fe7e6acf525
merge: better error messages to lead users to hg update --clean to abandon merges.
Fixes issue1533.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Wed, 04 Mar 2009 13:06:16 -0600 |
parents | 8838fe5a236f |
children |
line wrap: on
line source
#!/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