Mercurial > hg
view tests/test-merge-remove @ 6461:eb69e7989145
tests: easier error diagnostics for test-serve
author | Dirkjan Ochtman <dirkjan@ochtman.nl> |
---|---|
date | Thu, 03 Apr 2008 12:46:37 +0200 |
parents | 653ddd1d7cd7 |
children |
line wrap: on
line source
#!/bin/sh hg init repo cd repo echo foo > foo echo bar > bar hg ci -qAm 'add foo bar' echo foo2 >> foo echo bleh > bar hg ci -m 'change foo bar' hg up -qC 0 hg mv foo foo1 echo foo1 > foo1 hg cat foo >> foo1 hg ci -m 'mv foo foo1' hg merge hg debugstate --nodates hg st -q echo '% removing foo1 and bar' cp foo1 F cp bar B hg rm -f foo1 bar hg debugstate --nodates hg st -qC echo '% readding foo1 and bar' cp F foo1 cp B bar hg add -v foo1 bar hg debugstate --nodates hg st -qC echo '% reverting foo1 and bar' hg revert -vr . foo1 bar hg debugstate --nodates hg st -qC hg diff