Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4 @ 2528:049f930f18c1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Workaround to work with less sophisticated sed versions. For example NetBSD sed doesn't know about '\|'.
author Sascha Wilde <wilde@sha-bang.de>
date Tue, 27 Jun 2006 21:56:11 +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"