mercurial-crew-with-dirclash: tests/test-586@466323968b23

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

tests/test-586

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
	Mon, 27 Aug 2007 14:21:04 -0300
changeset 5242	466323968b23
parent 4536	720ae5085ee3
permissions	-rwxr-xr-x

Avoid adding to the changelog executable files added by the second parent. This was a regression introduced by b51a8138292a.


#!/bin/sh
# a test for issue586

hg init a
cd a
echo a > a
hg ci -Ama

hg init ../b
cd ../b
echo b > b
hg ci -Amb

hg pull -f ../a
hg merge
hg rm -f a
hg ci -Amc

hg st -A

mercurial-crew-with-dirclash

RSS Atom