Show More
@@ -1,5 +1,3 b'' | |||||
1 | $ "$TESTDIR/hghave" unix-permissions || exit 80 |
|
|||
2 |
|
||||
3 |
|
|
1 | $ hg init a | |
4 | $ mkdir a/d1 |
|
2 | $ mkdir a/d1 | |
5 | $ mkdir a/d1/d2 |
|
3 | $ mkdir a/d1/d2 | |
@@ -631,7 +629,7 b' test paths outside repo root' | |||||
631 | > rename to bar |
|
629 | > rename to bar | |
632 | > EOF |
|
630 | > EOF | |
633 | applying patch from stdin |
|
631 | applying patch from stdin | |
634 | abort: path contains illegal component: ../outside/foo |
|
632 | abort: path contains illegal component: ../outside/foo (glob) | |
635 | [255] |
|
633 | [255] | |
636 | $ cd .. |
|
634 | $ cd .. | |
637 |
|
635 | |||
@@ -906,12 +904,16 b' Issue2102: hg export and hg import speak' | |||||
906 | > new mode 100755 |
|
904 | > new mode 100755 | |
907 | > EOF |
|
905 | > EOF | |
908 | applying patch from stdin |
|
906 | applying patch from stdin | |
|
907 | ||||
|
908 | #if execbit | |||
|
909 | ||||
909 | $ hg sum |
|
910 | $ hg sum | |
910 | parent: 1:d59915696727 tip |
|
911 | parent: 1:d59915696727 tip | |
911 | help management of empty pkg and lib directories in perforce |
|
912 | help management of empty pkg and lib directories in perforce | |
912 | branch: default |
|
913 | branch: default | |
913 | commit: (clean) |
|
914 | commit: (clean) | |
914 | update: (current) |
|
915 | update: (current) | |
|
916 | ||||
915 | $ hg diff --git -c tip |
|
917 | $ hg diff --git -c tip | |
916 | diff --git a/lib/place-holder b/lib/place-holder |
|
918 | diff --git a/lib/place-holder b/lib/place-holder | |
917 | new file mode 100644 |
|
919 | new file mode 100644 | |
@@ -930,6 +932,39 b' Issue2102: hg export and hg import speak' | |||||
930 | diff --git a/src/cmd/gc/mksys.bash b/src/cmd/gc/mksys.bash |
|
932 | diff --git a/src/cmd/gc/mksys.bash b/src/cmd/gc/mksys.bash | |
931 | old mode 100644 |
|
933 | old mode 100644 | |
932 | new mode 100755 |
|
934 | new mode 100755 | |
|
935 | ||||
|
936 | #else | |||
|
937 | ||||
|
938 | $ hg sum | |||
|
939 | parent: 1:28f089cc9ccc tip | |||
|
940 | help management of empty pkg and lib directories in perforce | |||
|
941 | branch: default | |||
|
942 | commit: (clean) | |||
|
943 | update: (current) | |||
|
944 | ||||
|
945 | $ hg diff --git -c tip | |||
|
946 | diff --git a/lib/place-holder b/lib/place-holder | |||
|
947 | new file mode 100644 | |||
|
948 | --- /dev/null | |||
|
949 | +++ b/lib/place-holder | |||
|
950 | @@ -0,0 +1,2 @@ | |||
|
951 | +perforce does not maintain empty directories. | |||
|
952 | +this file helps. | |||
|
953 | diff --git a/pkg/place-holder b/pkg/place-holder | |||
|
954 | new file mode 100644 | |||
|
955 | --- /dev/null | |||
|
956 | +++ b/pkg/place-holder | |||
|
957 | @@ -0,0 +1,2 @@ | |||
|
958 | +perforce does not maintain empty directories. | |||
|
959 | +this file helps. | |||
|
960 | ||||
|
961 | /* The mode change for mksys.bash is missing here, because on platforms */ | |||
|
962 | /* that don't support execbits, mode changes in patches are ignored when */ | |||
|
963 | /* they are imported. This is obviously also the reason for why the hash */ | |||
|
964 | /* in the created changeset is different to the one you see above the */ | |||
|
965 | /* #else clause */ | |||
|
966 | ||||
|
967 | #endif | |||
933 | $ cd .. |
|
968 | $ cd .. | |
934 |
|
969 | |||
935 |
|
970 |
General Comments 0
You need to be logged in to leave comments.
Login now