Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict @ 5408:36794dbe66a3
Test workingctx exec/link bit for copies.
Also, make the test runnable on platforms without symlinks.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 07 Oct 2007 15:13:50 +0200 |
parents | 93a4e72b4f83 |
children |
line wrap: on
line source
#!/bin/sh hg init echo "nothing" > a hg add a hg commit -m ancestor -d "1000000 0" echo "something" > a hg commit -m branch1 -d "1000000 0" hg co 0 echo "something else" > a hg commit -m branch2 -d "1000000 0" hg merge 1 hg id cat a hg status