Mercurial > hg
view tests/test-update-issue1456.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 | db0340f4b507 |
children | f2719b387380 |
line wrap: on
line source
$ "$TESTDIR/hghave" execbit || exit 80 $ rm -rf a $ hg init a $ cd a $ echo foo > foo $ hg ci -qAm0 $ chmod +x foo $ hg ci -m1 $ hg co -q 0 $ echo dirty > foo $ hg up -c abort: uncommitted local changes [255] $ hg up -q $ cat foo dirty $ hg st -A M foo Validate update of standalone execute bit change: $ hg up -C 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ chmod -x foo $ hg ci -m removeexec nothing changed [1] $ hg up -C 0 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg up 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg st