log tests/test-merge-revert2 @ 6684:3ef6adad4e43

age author description
Sat, 28 Apr 2007 17:55:45 -0300 Alexis S. L. Carvalho run-tests.py: pass -L/--label to simplemerge
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho change tests to use simplemerge by default
Tue, 26 Dec 2006 14:17:48 +0100 Thomas Arendsen Hein Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.
Mon, 02 Oct 2006 08:36:29 +0200 Benoit Boissinot test-merge-revert2 solaris fix
Tue, 26 Sep 2006 00:05:24 +0100 Stephen Darnell Add -D/--nodates options to hg diff/export that removes dates from diff headers
Mon, 21 Aug 2006 09:44:52 -0700 Vadim Gelfer revert: require --all to revert all files.
Fri, 31 Mar 2006 10:37:25 -0800 Vadim Gelfer rewrite revert command. fix issues 93, 123, 147.
Mon, 13 Mar 2006 13:05:41 +0100 Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Sat, 20 Aug 2005 13:08:07 -0700 mpm Merge with jeffpc
Fri, 19 Aug 2005 16:45:25 -0800 mpm Merge with TAH
Thu, 18 Aug 2005 13:33:39 +0100 TK Soh test fixes for Solaris 2.6
Sat, 13 Aug 2005 19:43:42 -0800 mpm Merge with BOS
Sat, 13 Aug 2005 15:26:32 -0800 Bryan O'Sullivan Merge walk changes with Matt's tip.
Sat, 13 Aug 2005 15:23:06 -0800 Bryan O'Sullivan Merge with TAH.
Fri, 12 Aug 2005 23:54:09 -0800 mpm Merge with TAH
Wed, 10 Aug 2005 08:23:42 +0100 Thomas Arendsen Hein Extended test case to test dirstate length bug fixed in a7e95e3606c7.
Thu, 04 Aug 2005 13:31:25 -0800 mpm Merge with BOS
Thu, 04 Aug 2005 13:27:41 -0800 mpm Merge with TAH
Thu, 04 Aug 2005 18:13:17 +0100 Thomas Arendsen Hein Removed special FIXME handling in run-tests, added bug info to .out files.
Sat, 30 Jul 2005 08:35:29 -0800 mpm Merge with TAH
Fri, 29 Jul 2005 15:59:10 +0100 Thomas Arendsen Hein Allow tests for not yet fixed bugs to fail without generating error diff.
Fri, 29 Jul 2005 15:19:43 +0100 Thomas Arendsen Hein Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Sat, 23 Jul 2005 17:14:05 +0100 Thomas Arendsen Hein Added tests for bug with three-way-merging of old tip, tip and cwd.