Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-rollback @ 3506:9de0e64545a3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Test that we notice the empty files from the second parent during a merge This didn't work with 0.9.1, but was fixed by 05257fd28591.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Wed, 25 Oct 2006 02:51:27 -0300
parents 4f072bb06e89
children
line wrap: on
line source

#!/bin/sh

mkdir t
cd t
hg init
echo a > a
hg add a
hg commit -m "test" -d "1000000 0"
hg verify
hg parents
hg status
hg rollback
hg verify
hg parents
hg status