diff tests/test-flags.out @ 495:e94cebc60d96

Pull from TAH

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

Pull from TAH

manifest hash: 08b55e07198b8a4272753895fe3727d9f52ebb75
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCwO5YywK+sNU5EO8RArUtAJ9gsYYNbZH22COOz9B7ppwgCDxM8ACfYWcl
n9Dim3Z7qepGUXvRDEeFZ9c=
=JMQx
-----END PGP SIGNATURE-----

--- a/tests/test-flags.out	Mon Jun 27 22:23:56 2005 -0800
+++ b/tests/test-flags.out	Mon Jun 27 22:29:44 2005 -0800
@@ -1,3 +1,15 @@
++ 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
@@ -5,6 +17,13 @@
 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
@@ -12,6 +31,7 @@
 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
@@ -24,6 +44,7 @@
 date:        Thu Jan  1 00:00:00 1970
 summary:     a updated
 
++ hg history
 changeset:   2:3ef54330565526bebf37a0d9bf540c283fd133a1
 tag:         tip
 parent:      0:22a449e20da501ca558394c083ca470e9c81b9f7
@@ -41,11 +62,14 @@
 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---