Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4 @ 2962:882e703eaa94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate.py: when comparing mtimes, use only the integer part. Python 2.5 can return timestamps with subsecond resolution.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 20 Aug 2006 01:13:11 -0300
parents e506c14382fd
children
line wrap: on
line source

#!/bin/sh

hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg update 0
echo This is file c1 > c
hg add c
hg commit -m "commit #2" -d "1000000 0"
hg merge 1
rm b
echo This is file c22 > c
hg commit -m "commit #3" -d "1000000 0"