Mercurial > hg
view tests/test-merge8 @ 11701:84fb29f5e0d2
mq: fix qimport --name --existing --force on win32
os.rename() does not overwrite existing targets on Windows.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Wed, 28 Jul 2010 11:07:20 +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