Mercurial > hg
view tests/test-mq-symlinks @ 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.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 05 Nov 2009 10:53:59 +0100 |
parents | d08099e74b81 |
children | 8cb81d75730c |
line wrap: on
line source
#!/bin/sh "$TESTDIR/hghave" symlink || exit 80 echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH hg init hg qinit hg qnew base.patch echo aaa > a echo bbb > b echo ccc > c hg add a b c hg qrefresh $TESTDIR/readlink.py a echo '% test replacing a file with a symlink' hg qnew symlink.patch rm a ln -s b a hg qrefresh --git $TESTDIR/readlink.py a hg qpop hg qpush $TESTDIR/readlink.py a echo '% test updating a symlink' rm a ln -s c a hg qnew --git -f updatelink $TESTDIR/readlink.py a hg qpop hg qpush --debug $TESTDIR/readlink.py a hg st echo '% test replacing a symlink with a file' ln -s c s hg add s hg qnew --git -f addlink rm s echo sss > s hg qnew --git -f replacelinkwithfile hg qpop hg qpush cat s hg st echo '% test symlink removal' hg qnew removesl.patch hg rm a hg qrefresh --git hg qpop hg qpush hg st -c