Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-committer @ 3506: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 | 8b55c0ba8048 |
children | 98f2507c5551 |
line wrap: on
line source
#!/bin/sh unset HGUSER EMAIL="My Name <myname@example.com>" export EMAIL hg init test cd test touch asdf hg add asdf hg commit -d '1000000 0' -m commit-1 hg tip unset EMAIL echo 1 > asdf hg commit -d '1000000 0' -m commit-1 hg commit -d '1000000 0' -u "foo@bar.com" -m commit-1 hg tip echo "[ui]" >> .hg/hgrc echo "username = foobar <foo@bar.com>" >> .hg/hgrc echo 12 > asdf hg commit -d '1000000 0' -m commit-1 hg tip echo 1 > asdf hg commit -d '1000000 0' -u "foo@bar.com" -m commit-1 hg tip