Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-merge8 @ 5055:56d48aed1f69
imerge: tarfile.extractall is only available in python2.5
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Thu, 02 Aug 2007 14:04:00 +0200 |
parents | efbe24c7d8d9 |
children |
line wrap: on
line source
#!/bin/sh # Test for changeset ba7c74081861 # (update dirstate correctly for non-branchmerge updates) hg init a cd a echo a > a hg add a hg commit -m a cd .. hg clone a b cd a hg mv a b hg commit -m move echo b >> b hg commit -m b cd ../b hg pull ../a hg update