Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-empty-file @ 3702:70c3ee224c08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't generate git patches that rename a file to multiple destinations With this patch, instead of generating N renames, we'll generate 1 rename and N-1 copies. Ideally the rename should come after the copies instead of before them, but that'd be harder to do.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 20 Nov 2006 19:32:46 -0200
parents 9de0e64545a3
children ad3d5b4367cb
line wrap: on
line source

#!/bin/sh

hg init a
cd a
touch empty1
hg add empty1
hg commit -m 'add empty1' -d '1000000 0'

touch empty2
hg add empty2
hg commit -m 'add empty2' -d '1000000 0'

hg up -C 0
touch empty3
hg add empty3
hg commit -m 'add empty3' -d '1000000 0'

hg heads

hg merge 1
# before changeset 05257fd28591, we didn't notice the 
# empty file that came from rev 1.
hg status
hg commit -m merge -d '1000000 0'
hg manifest tip