Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge1.out @ 489:a636f7d2cd5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[PATCH] umask for run-tests -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] umask for run-tests From: Bryan O'Sullivan <bos@serpentine.com> Another local factor affecting test breakage: umask. Mine is 002, but some other people seem to use 022. This patch makes run-tests explicitly set a umask. manifest hash: 39aaea44746b113e992bcf0a9e93d9de3961c907 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwOz8ywK+sNU5EO8RAvr7AJ9gRknqzQD6UmV1SpzHGqQyclcuxgCeItoD W7yNbrtIAPyMJsfwhVECx3s= =KhYb -----END PGP SIGNATURE-----
author mpm@selenic.com
date Mon, 27 Jun 2005 22:23:56 -0800
parents 5b22029b5aa2
children 7e4843b7efd2
line wrap: on
line source

+ cat
+ chmod +x merge
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b1
+ hg add b
+ hg commit -t 'commit #1' -d '0 0' -u user
+ hg update 0
+ echo This is file c1
+ hg add c
+ hg commit -t 'commit #2' -d '0 0' -u user
+ echo This is file b1
+ env HGMERGE=../merge hg update -m 1
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b1
+ hg add b
+ hg commit -t 'commit #1' -d '0 0' -u user
+ hg update 0
+ echo This is file c1
+ hg add c
+ hg commit -t 'commit #2' -d '0 0' -u user
+ echo This is file b2
+ env HGMERGE=../merge hg update -m 1
merging for b
merging b
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b1
+ hg add b
+ hg commit -t 'commit #1' -d '0 0' -u user
+ echo This is file b22
+ hg commit -t 'commit #2' -d '0 0' -u user
+ hg update 1
+ echo This is file c1
+ hg add c
+ hg commit -t 'commit #3' -d '0 0' -u user
+ cat b
This is file b1
+ echo This is file b22
+ env HGMERGE=../merge hg update -m 2
merging for b
merging b
+ cd ..
+ /bin/rm -rf t
+ mkdir t
+ cd t
+ hg init
+ echo This is file a1
+ hg add a
+ hg commit -t 'commit #0' -d '0 0' -u user
+ echo This is file b1
+ hg add b
+ hg commit -t 'commit #1' -d '0 0' -u user
+ echo This is file b22
+ hg commit -t 'commit #2' -d '0 0' -u user
+ hg update 1
+ echo This is file c1
+ hg add c
+ hg commit -t 'commit #3' -d '0 0' -u user
+ echo This is file b33
+ env HGMERGE=../merge hg update -m 2
merging for b
merging b
+ cd ..
+ /bin/rm -rf t