view tests/test-backwards-remove @ 2548:0229ff95faec

Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.
author Thomas Arendsen Hein <thomas@intevation.de>
date Mon, 03 Jul 2006 19:14:29 +0200
parents 7544700fd931
children
line wrap: on
line source

#!/bin/sh
hg init
echo This is file a1 > a
hg add a
hg commit -m "commit #0" -d "1000000 0"
ls
echo This is file b1 > b
hg add b
hg commit -m "commit #1" -d "1000000 0"
hg co 0
# B should disappear
ls