Mercurial > hg
view tests/test-clone @ 3509:9de0e64545a3
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 | ba198d17eea9 |
children | 76c4cadb49fc |
line wrap: on
line source
#!/bin/sh mkdir a cd a hg init echo a > a hg add a hg commit -m test -d '0 0' # Default operation hg clone . ../b cd ../b cat a hg verify # No update hg clone -U . ../c cd ../c cat a 2>/dev/null || echo "a not present" hg verify # Default destination mkdir ../d cd ../d hg clone ../a cd a hg cat a