mercurial-crew-with-dirclash: tests/test-merge4@6990e499d71a

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

tests/test-merge4

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
	Sat, 18 Nov 2006 19:44:42 -0200
changeset 3675	6990e499d71a
parent 2283	e506c14382fd
permissions	-rwxr-xr-x

Revert almost all of 5be434785317; add a test Because of file copies, we should update the manifest dict only after committing all files.


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