Mercurial > hg
view tests/test-inotify-dirty-dirstate.t @ 16264:0628290d98df stable
tests: ignore git's output in test-subrepo-git.t
git version 1.7.9.1 makes the testsuite fail with:
@@ -482,7 +482,17 @@
Sticky repository, update --clean
$ hg update --clean tip
- Previous HEAD position was aa84837... f
+ Warning: you are leaving 2 commits behind, not connected to
+ any of your branches:
+
+ aa84837 f
+ 126f2a1 gg
+
+ If you want to keep them by creating a new branch, this may be a good time
+ to do so with:
+
+ git branch new_branch_name aa84837ccfbdfedcdcdeeedc309d73e6eb069edc
+
HEAD is now at 32a3438... fff
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg id -n
ERROR: test-subrepo-git.t output changed
author | Javi Merino <cibervicho@gmail.com> |
---|---|
date | Thu, 15 Mar 2012 23:02:31 +0000 |
parents | ffb5c09ba822 |
children | f2719b387380 |
line wrap: on
line source
issues when status queries are issued when dirstate is dirty $ "$TESTDIR/hghave" inotify || exit 80 $ echo "[extensions]" >> $HGRCPATH $ echo "inotify=" >> $HGRCPATH $ echo "fetch=" >> $HGRCPATH issue1810: inotify and fetch $ hg init test; cd test $ hg inserve -d --pid-file=../hg.pid $ cat ../hg.pid >> "$DAEMON_PIDS" $ echo foo > foo $ hg add adding foo $ hg ci -m foo $ cd .. $ hg --config "inotify.pidfile=../hg2.pid" clone test test2 updating to branch default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cat ../hg2.pid >> "$DAEMON_PIDS" $ cd test2 $ echo bar > bar $ hg add adding bar $ hg ci -m bar $ cd ../test $ echo spam > spam $ hg add adding spam $ hg ci -m spam $ cd ../test2 $ hg st abort, outstanding changes $ hg fetch -q $ hg st $ cd .. issue1719: inotify and mq $ echo "mq=" >> $HGRCPATH $ hg init test-1719 $ cd test-1719 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 popping test.patch patch queue now empty st should not output anything $ hg status $ hg qpush applying test.patch now at: test.patch st should not output anything $ hg status $ hg qrefresh $ hg status