5 Commits

Author	SHA1	Message	Date
Vadim Gelfer	e5df462a15	deprecate 'update -m'. use 'merge' instead.	2006-05-14 21:07:34 -07:00
Thomas Arendsen Hein	1b244c77c7	Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. ... Some systems show "Thu Jan 01" instead of "Thu Jan 1", which breaks tests. Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on all systems.	2006-03-13 13:05:41 +01:00
Thomas Arendsen Hein	f9e80dc2e8	Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.	2005-07-29 15:19:43 +01:00
mpm@selenic.com	3a08ca5eaa	Update tests to use commit -m and default -u ... manifest hash: 6e4385453843031a712005a320d6000595b40d05	2005-07-21 15:05:17 -05:00
mpm@selenic.com	ee0f69d039	[PATCH] Removal of a file added by merging branches ... -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 [PATCH] Removal of a file added by merging branches From: Michael A Fetterman <Michael.Fetterman@cl.cam.ac.uk> Fixing a bug where removal of a file which is added when doing a merge would cause python exception to be thrown. manifest hash: 0bdd80e8abcee6aaa4804bb588f9939596fb3dd0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCuNjLywK+sNU5EO8RAo44AJ4mvjsJcYOj/EmVDFrdkK3D3WHFSwCffxfV cRl8mXc252/oRcYaMZbgrlg= =S5x6 -----END PGP SIGNATURE-----	2005-06-21 19:19:39 -08:00