mercurial-crew-with-dirclash: tests/test-merge4@7e05bdeee7de

Mercurial Mercurial > hg > mercurial-crew-with-dirclash / file revision

tests/test-merge4

author	Brendan Cully <brendan@kublai.com>
	Wed, 15 Aug 2007 14:38:18 -0700
changeset 5173	7e05bdeee7de
parent 2283	e506c14382fd
permissions	-rwxr-xr-x

convert: raise Abort instead of NoRepo when CVS pserver auth fails. At this point we know the source is CVS, so we should not go through the rest of the converters.


#!/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"

mercurial-crew-with-dirclash

RSS Atom