Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4 @ 2643:3b53fa20dda8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Preserve multibyte UTF-8 characters when obfuscating. This version uses the unicode 'replace' option, so non-UTF-8 encodings will still be mangled. Luckily, there aren't any of those.
author Brendan Cully <brendan@kublai.com>
date Fri, 21 Jul 2006 02:36:17 +0200
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"