log tests/test-up-local-change.out @ 1674:dee55c4a4963

age author description
Wed, 01 Feb 2006 08:46:24 +0100 Benoit Boissinot abort when using 'update -m' and this is not a merge
Tue, 24 Jan 2006 15:02:10 +1300 mason Add new bdiff based unidiff generation.
Wed, 14 Dec 2005 22:19:03 -0600 Benoit Boissinot abort when merging two heads and repository has local changes
Mon, 26 Sep 2005 16:52:47 -0700 Matt Mackall Repair ancestor logic, fix up test cases
Sat, 20 Aug 2005 13:08:07 -0700 mpm Merge with jeffpc
Fri, 19 Aug 2005 23:23:42 -0800 Samuel Tardieu [PATCH] Print timezone offset when outputting dates
Tue, 16 Aug 2005 19:03:01 -0800 mpm run-tests: remove '+ hg' trick
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:21:02 +0100 Thomas Arendsen Hein Updated output of tests.
Fri, 29 Jul 2005 06:43:21 +0100 Thomas Arendsen Hein Merge with upstream
Wed, 27 Jul 2005 10:21:19 -0800 mpm Fix tests for short changeset hashes and hidden manifest hashes
Tue, 26 Jul 2005 19:23:59 -0800 mpm Fix up test results
Sat, 23 Jul 2005 10:00:56 -0500 mpm Fix local file changes being ignored after non-branch merge
Fri, 22 Jul 2005 19:46:02 -0800 Bryan O'Sullivan Update tests to match new addremove chattiness.