Mercurial > hg
view tests/test-merge8 @ 8804:820723a4bd17
dirstate: fix typo introduced by 3507f6c7715c
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sat, 13 Jun 2009 22:42:16 +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