log tests/test-up-local-change @ 8669:6f0f69da003e

age author description
Thu, 21 Jun 2007 09:25:49 +0200 Thomas Arendsen Hein Kill trailing spaces
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho change tests to use simplemerge by default
Tue, 26 Sep 2006 00:05:24 +0100 Stephen Darnell Add -D/--nodates options to hg diff/export that removes dates from diff headers
Sun, 14 May 2006 21:07:34 -0700 Vadim Gelfer deprecate 'update -m'. use 'merge' instead.
Fri, 14 Apr 2006 00:41:50 +0200 Benoit Boissinot fix update when a locally added file match the target revision
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.
Wed, 01 Feb 2006 08:46:24 +0100 Benoit Boissinot abort when using 'update -m' and this is not a merge
Wed, 14 Dec 2005 22:19:03 -0600 Benoit Boissinot abort when merging two heads and repository has local changes
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, 30 Jul 2005 09:00:14 -0800 mpm Merge with BOS
Sat, 30 Jul 2005 08:35:29 -0800 mpm Merge with TAH
Fri, 29 Jul 2005 15:19:43 +0100 Thomas Arendsen Hein Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Fri, 29 Jul 2005 06:43:21 +0100 Thomas Arendsen Hein Merge with upstream
Tue, 26 Jul 2005 19:03:45 -0800 mpm Change sed patterns in tests to strip dates after spaces or tabs
Thu, 21 Jul 2005 15:05:17 -0500 mpm Update tests to use commit -m and default -u
Sat, 02 Jul 2005 22:54:35 -0800 mpm options: kill -d for debug
Thu, 30 Jun 2005 23:28:16 -0800 mpm Merge with TAH
Fri, 01 Jul 2005 07:22:27 +0100 Thomas Arendsen Hein Remove bashisms and use /bin/sh instead of /bin/bash.
Sun, 26 Jun 2005 15:20:46 -0800 mpm [PATCH] add clone command
Wed, 15 Jun 2005 00:33:57 -0800 mpm Merge with TAH
Wed, 15 Jun 2005 08:32:29 +0100 Thomas Arendsen Hein Merged with mercurial-identify (which includes upstream's current tip)
Tue, 14 Jun 2005 13:44:37 -0800 mpm testing fixups
Tue, 14 Jun 2005 13:28:42 -0800 mpm Add a simple testing framework