Mercurial > hg
view tests/test-mq-safety @ 7785:660c8dd44060
test-merge-tool: Make sure no hgmerge can be found in $PATH
The merge tool selecting algorithm is hardcoded to look for hgmerge in $PATH
before it falls back to use internal merge. This fixes the test for this
fallback to be tolerant to existing hgmerges.
author | Mads Kiilerich <mads@kiilerich.com> |
---|---|
date | Tue, 10 Feb 2009 22:47:38 +0100 |
parents | dcda0c90125c |
children | 5b7da468531b |
line wrap: on
line source
#!/bin/sh echo '[extensions]' >> $HGRCPATH echo 'hgext.mq =' >> $HGRCPATH hg init repo cd repo echo foo > foo hg ci -qAm 'add a file' hg qinit hg qnew foo echo foo >> foo hg qrefresh -m 'append foo' hg qnew bar echo bar >> foo hg qrefresh -m 'append bar' echo '% try to commit on top of a patch' echo quux >> foo hg ci -m 'append quux' # cheat a bit... mv .hg/patches .hg/patches2 hg ci -m 'append quux' mv .hg/patches2 .hg/patches echo '% qpop/qrefresh on the wrong revision' hg qpop hg qpop -n patches 2>&1 | sed -e 's/\(using patch queue:\).*/\1/' hg qrefresh hg up -C qtip echo '% qpop' hg qpop echo '% qrefresh' hg qrefresh echo '% tip:' hg tip --template '#rev# #desc#\n'