view tests/test-remove @ 2175:b2ae81a7df29

Make hg update more verbose by default (issue12) (including small changes to revert and backout to not show these stats with the exception of backout --merge) Show update stats (unless -q), e.g.: K files updated, L files merged, M files removed, N files unresolved Inform the user what to do after a merge: (branch merge, don't forget to commit) Inform the user what to do if a branch merge failed: There are unresolved merges, you can redo the full merge using: hg update -C X hg merge Y Inform the user what to do if a working directory merge failed: There are unresolved merges with locally modified files.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 02 May 2006 18:44:02 +0200
parents 379ab45b91b7
children 82385773df6c
line wrap: on
line source

#!/bin/sh

hg init a
cd a
echo a > foo
hg add foo
hg commit -m 1 -d "1000000 0"
rm foo
hg remove foo
hg commit -m 2 -d "1000000 0"
hg export 0
hg export 1
hg log -p -r 0
hg log -p -r 1

cd ..
hg clone a b