comparison tests/test-split.t @ 41892:0cbcb3e13fcf

tests: stabilize test-split.t for Windows It looks like there will be additional problems beyond this trivial fix, but this should make the bot green again.
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 09 Mar 2019 12:55:24 -0500
parents 7da6307cc07a
children f8c5225b9054
comparison
equal deleted inserted replaced
41891:e82c932c01e3 41892:0cbcb3e13fcf
716 $ hg init $TESTTMP/issue5864 716 $ hg init $TESTTMP/issue5864
717 $ cd $TESTTMP/issue5864 717 $ cd $TESTTMP/issue5864
718 $ echo foo > foo 718 $ echo foo > foo
719 $ hg add foo 719 $ hg add foo
720 $ hg ci -m "initial" 720 $ hg ci -m "initial"
721 $ chmod +x foo 721 $ hg import -q --bypass -m "make executable" - <<EOF
722 $ hg ci -m "make executable" 722 > diff --git a/foo b/foo
723 > old mode 100644
724 > new mode 100755
725 > EOF
726 $ hg up -q
723 727
724 $ hg glog 728 $ hg glog
725 @ 1:3a2125f0f4cb make executable 729 @ 1:3a2125f0f4cb make executable
726 | 730 |
727 o 0:51f273a58d82 initial 731 o 0:51f273a58d82 initial
728 732
729 733
734 #if no-windows
730 $ printf 'y\ny\ny\n' | hg split 735 $ printf 'y\ny\ny\n' | hg split
731 diff --git a/foo b/foo 736 diff --git a/foo b/foo
732 old mode 100644 737 old mode 100644
733 new mode 100755 738 new mode 100755
734 examine changes to 'foo'? [Ynesfdaq?] y 739 examine changes to 'foo'? [Ynesfdaq?] y
749 diff --git a/foo b/foo 754 diff --git a/foo b/foo
750 old mode 100644 755 old mode 100644
751 new mode 100755 756 new mode 100755
752 examine changes to 'foo'? [Ynesfdaq?] abort: response expected 757 examine changes to 'foo'? [Ynesfdaq?] abort: response expected
753 [255] 758 [255]
759 #else
760
761 TODO: Fix this on Windows. See issue 2020 and 5883
762
763 $ printf 'y\ny\ny\n' | hg split
764 abort: cannot split an empty revision
765 [255]
766 #endif