mercurial-crew-with-dirclash: tests/test-merge4@9f952dd4413b

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

tests/test-merge4

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
	Tue, 05 Jun 2007 19:26:36 -0300
changeset 4506	9f952dd4413b
parent 2283	e506c14382fd
permissions	-rwxr-xr-x

test-serve: let run-tests.py kill the daemons If the daemons die while the tests are still running, we'll get additional "killed!" messages, making the test fail.


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