Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-unrelated-pull @ 4815:8808ea7da86b
merge: make test for fast-forward merge stricter (issue619)
don't allow merging with an ancestor
fix != on contexts
add a test
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 05 Jul 2007 13:34:18 -0500 |
parents | dac4bd67f6c5 |
children |
line wrap: on
line source
#!/bin/sh mkdir a cd a hg init echo 123 > a hg add a hg commit -m "a" -u a -d "1000000 0" cd .. mkdir b cd b hg init echo 321 > b hg add b hg commit -m "b" -u b -d "1000000 0" hg pull ../a hg pull -f ../a hg heads