Mercurial > hg > pyhgsh

view tests/test-merge4 @ 2347:5b178298b7f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use a more reliable way to find what are the new changesets on pull/unbundle The number of csets and the hooks where wrong (negative number of csets) when we unbundled a bundle which contains csets we already had. Remove unused variables.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 24 May 2006 10:59:30 +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"