mercurial-crew-with-dirclash: tests/test-merge4@50a18815e3f0

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

tests/test-merge4

author	Giorgos Keramidas <keramida@ceid.upatras.gr>
	Tue, 10 Oct 2006 21:03:24 +0300
changeset 3351	50a18815e3f0
parent 2283	e506c14382fd
permissions	-rwxr-xr-x

Revert changeset c67920d78248. It breaks 'hg merge && hg up -c REV' when files exist only in one of the manifests, making hg throw a traceback like:


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