view tests/test-cat @ 6375:cdc458b12f0f

update: better logic and messages for updates

- complain about attempts to merge with ancestor
- when updating, differentiate between
  - crossing named branches with no local changes (jump)
  - crossing named branches with local changes (complain)
  - nonlinear update on the same named branch, no changes (complain some more)
  - nonlinear update on the same named branch, changes (different complaining)

#!/bin/sh
#
mkdir t
cd t
hg init
echo 0 > a
echo 0 > b
hg ci -A -m m -d "1000000 0"
hg rm a
hg cat a
hg cat --decode a # more tests in test-encode
echo 1 > b
hg ci -m m -d "1000000 0"
echo 2 > b
hg cat -r 0 a
hg cat -r 0 b
hg cat -r 1 a
hg cat -r 1 b