Mercurial > hg
view tests/test-merge8 @ 6083:81a8667331e8
convert: detect baz before tla
The former seems to handle repositories built by the latter, the opposite is not true.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Tue, 12 Feb 2008 23:35:35 +0100 |
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