view tests/test-merge4 @ 3084:75dcfe28da4a

sshrepo: don't try to validate when creating the repo - This removes the "repo not found" error when cloning or init-ing a remote repo. - Since the remote hg will abort if the repo already exists we don't need to validate it.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 13 Sep 2006 19:57:40 +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"