view tests/test-children @ 9717:68a1b9d0663e

update: allow branch crossing without -c or -C, with no uncommitted changes

Update will now allow crossing branches within the same named branch,
when given a specific revision, if the working dir is clean, without
requiring the -c or -C option. Abort if no revision is given and
this would cross branches.  Minor change to abort message if
uncommitted changes are found.

Modify test-update-branches and output to reflect the altered case. Modify
test-merge5.out to reflect the altered case. Modify
test-up-local-change.out with new message.

#!/bin/sh
# test children command

cat <<EOF >> $HGRCPATH
[extensions]
hgext.children=
EOF

echo "% init"
hg init t
cd t

echo "% no working directory"
hg children

echo % setup
echo 0 > file0
hg ci -qAm 0 -d '0 0'

echo 1 > file1
hg ci -qAm 1 -d '1 0'

echo 2 >> file0
hg ci -qAm 2 -d '2 0'

hg co null
echo 3 > file3
hg ci -qAm 3 -d '3 0'

echo "% hg children at revision 3 (tip)"
hg children

hg co null
echo "% hg children at nullrev (should be 0 and 3)"
hg children

hg co 1
echo "% hg children at revision 1 (should be 2)"
hg children

hg co 2
echo "% hg children at revision 2 (other head)"
hg children

for i in null 0 1 2 3; do
  echo "% hg children -r $i"
  hg children -r $i
done

echo "% hg children -r 0 file0 (should be 2)"
hg children -r 0 file0

echo "% hg children -r 1 file0 (should be 2)"
hg children -r 1 file0

hg co 0
echo "% hg children file0 at revision 0 (should be 2)"
hg children file0