Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Fixed test-flags and .out for arbitrary umask settings. Use -ex shell flags.

manifest hash: b6c5a0bb17de794fc5822b0672af8b977bd77950
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFCv5GIW7P1GVgWeRoRAimoAJ9s2RlZ3ljH8DZE2vbCmoWJX973LQCglo+s
GmajRX7o3kJxY88aNGy+TNs=
=TKmo
-----END PGP SIGNATURE-----

tests/test-flags

@@ -1,33 +1,34 b''
-#!/bin/sh +ex
+#!/bin/sh -ex
 
+umask 027
 mkdir test1
 cd test1
 
 hg init
 touch a b
 hg add a b
 hg ci -t "added a b" -u test -d "0 0"
 
 cd ..
 mkdir test2
 cd test2
 
 hg init
 hg pull ../test1
 hg co
 chmod +x a
 hg ci -t "chmod +x a" -u test -d "0 0"
 
 cd ../test1
 echo 123 >>a
 hg ci -t "a updated" -u test -d "0 0"
 
 hg pull ../test2
 hg heads
 hg history
 
 hg -dv co -m
 
 ls -l ../test[12]/a > foo
 cut -b 0-10 < foo
 

tests/test-flags.out

@@ -1,51 +1,75 b''
++ umask 027
++ mkdir test1
++ cd test1
++ hg init
++ touch a b
++ hg add a b
++ hg ci -t 'added a b' -u test -d '0 0'
++ cd ..
++ mkdir test2
++ cd test2
++ hg init
++ hg pull ../test1
 pulling from ../test1
 requesting all changes
 adding changesets
 adding manifests
 adding file revisions
 modified 2 files, added 1 changesets and 2 new revisions
 (run 'hg update' to get a working copy)
++ hg co
++ chmod +x a
++ hg ci -t 'chmod +x a' -u test -d '0 0'
++ cd ../test1
++ echo 123
++ hg ci -t 'a updated' -u test -d '0 0'
++ hg pull ../test2
 pulling from ../test2
 searching for changes
 adding changesets
 adding manifests
 adding file revisions
 modified 1 files, added 1 changesets and 1 new revisions
 (run 'hg update' to get a working copy)
++ hg heads
 changeset:   2:3ef54330565526bebf37a0d9bf540c283fd133a1
 tag:         tip
 parent:      0:22a449e20da501ca558394c083ca470e9c81b9f7
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     chmod +x a
 
 changeset:   1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     a updated
 
++ hg history
 changeset:   2:3ef54330565526bebf37a0d9bf540c283fd133a1
 tag:         tip
 parent:      0:22a449e20da501ca558394c083ca470e9c81b9f7
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     chmod +x a
 
 changeset:   1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     a updated
 
 changeset:   0:22a449e20da501ca558394c083ca470e9c81b9f7
 user:        test
 date:        Thu Jan  1 00:00:00 1970
 summary:     added a b
 
++ hg -dv co -m
 resolving manifests
  ancestor f328b97f7c11 local e7f06daf1cdb remote 629f0b785e0e
  a versions differ, resolve
 merging a
 resolving a
 file a: other 37c42bd6cc03 ancestor b80de5d13875
--rwxr-xr-x
--rwxr-xr-x
++ ls -l ../test1/a ../test2/a
++ cut -b 0-10
+-rwxr-x---
+-rwxr-x---