Mercurial > hg
view tests/test-mq-safety @ 6179:36ab165abbe2
patch: fix iterhunks() with trailing binary file removal
Like some renames or copy operations, binary file removal does not generate any
"file" or "hunk" action, but was not tagged as such and let iterhunk() assume
no hunk was applied for the deleted file.
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Thu, 28 Feb 2008 00:07:37 +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'