mercurial-crew-with-dirclash: tests/test-merge3.out annotate

annotate tests/test-merge3.out @ 422:10c43444a38e

[PATCH] Enables lock work under the other 'OS' -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Enables lock work under the other 'OS' From: K Thananchayan <thananck@yahoo.com> os.symlink is not supported under Windows. This patch introduces util.mklockf, util.getlowner that use regular files under Winodws but symlink under unix. tweaked by mpm: - changed function names - fixed to work on UNIX manifest hash: 6f650a78a3b203dcad2f861582500b6b4036599a -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuN5sywK+sNU5EO8RAva8AJ9L9z/JHRAJS1bix48ZzSpn9ZUyPwCffhmg UfLSFBmd5tPDDi3mgsrdDEA= =ZYS9 -----END PGP SIGNATURE-----

author	mpm@selenic.com
date	Tue, 21 Jun 2005 19:43:40 -0800
parents	2fe8d66e3075
children	7e4843b7efd2

rev	line source
402 2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: diff changeset	1 + hg init
2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: diff changeset	2 + echo This is file a1
2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: diff changeset	3 + hg add a
2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: diff changeset	4 + hg commit -t 'commit #0' -d '0 0' -u user
2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: diff changeset	5 + touch b
2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: diff changeset	6 + hg add b
2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: diff changeset	7 + rm b
2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: diff changeset	8 + hg commit -A '-tcomment #1' -d '0 0' -u user
2fe8d66e3075 [PATCH] (3/4) Removing an added file mpm@selenic.com parents: diff changeset	9 b never committed!

Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-merge3.out @ 422:10c43444a38e