Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge4 @ 4675:6858a7477a5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change branches to sort 'active' branches first, and add an option to show only active branches.
author Eric Hopper <hopper@omnifarious.org>
date Thu, 21 Jun 2007 10:40:09 -0700
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"