view tests/test-mq-qgoto @ 4682:dc5920ea12f8

merge: fix small bug with a failed merge across a rename If $HGMERGE wasn't able to fix the conflicts, we wouldn't copy f to fd, and util.set_exec wouldn't find the file.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 22 Jun 2007 20:44:40 -0300
parents 905397be7688
children 12df451ce205
line wrap: on
line source

#!/bin/sh

echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH

hg init a
cd a
echo a > a
hg ci -Ama

hg qnew a.patch
echo a >> a
hg qrefresh

hg qnew b.patch
echo b > b
hg add b
hg qrefresh

hg qnew c.patch
echo c > c
hg add c
hg qrefresh

hg qgoto a.patch
hg qgoto c.patch
hg qgoto b.patch