Mercurial > hg
view tests/test-inotify-dirty-dirstate @ 11715:4f9dfb54c8b5 stable
qpush --move: move the right patch even with comment lines
88fc876a4833 caused that we find the index of the moving patch in self.series
but look it up in self.full_series. The difference between these is that
full_series also contains comment lines, and we thus moved the wrong patch.
Use back self.full_series to find the moving patch, but take care of striping
the patch guard markers before comparing the patch name. Test cases have been
added for comments and empty lines in self.full_series, and for the case of
guarded patches.
Original patch contributed by Mads Kiilerich <mads@kiilerich.com>
author | Gilles Moris <gilles.moris@free.fr> |
---|---|
date | Sat, 10 Jul 2010 21:23:00 +0200 |
parents | 97eda2133a9b |
children |
line wrap: on
line source
#!/bin/sh # issues when status queries are issued when dirstate is dirty "$TESTDIR/hghave" inotify || exit 80 echo "[extensions]" >> $HGRCPATH echo "inotify=" >> $HGRCPATH echo "fetch=" >> $HGRCPATH echo % issue1810: inotify and fetch mkdir test; cd test hg init hg inserve -d --pid-file=../hg.pid cat ../hg.pid >> "$DAEMON_PIDS" echo foo > foo hg add hg ci -m foo cd .. hg --config "inotify.pidfile=../hg2.pid" clone test test2 cat ../hg2.pid >> "$DAEMON_PIDS" cd test2 echo bar > bar hg add hg ci -m bar cd ../test echo spam > spam hg add hg ci -m spam cd ../test2 hg st # abort, outstanding changes hg fetch -q hg st cd .. echo % issue1719: inotify and mq echo "mq=" >> $HGRCPATH hg init test-1719 cd test-1719 echo % inserve hg inserve -d --pid-file=../hg-test-1719.pid cat ../hg-test-1719.pid >> "$DAEMON_PIDS" echo content > file hg add file hg qnew -f test.patch hg status hg qpop echo % st should not output anything hg status hg qpush echo % st should not output anything hg status hg qrefresh hg status