Mon, 07 May 2007 08:42:48 -0700 Unconfuse font-lock
Brendan Cully <brendan@kublai.com> [Mon, 07 May 2007 08:42:48 -0700] rev 4411
Unconfuse font-lock
Sun, 06 May 2007 20:27:45 -0700 Add fast-forward branch merging
Brendan Cully <brendan@kublai.com> [Sun, 06 May 2007 20:27:45 -0700] rev 4410
Add fast-forward branch merging
Mon, 07 May 2007 00:12:35 +0200 Merge with crew-stable.
Patrick Mezard <pmezard@gmail.com> [Mon, 07 May 2007 00:12:35 +0200] rev 4409
Merge with crew-stable. HG: changed hgext/mq.py
Sun, 06 May 2007 23:44:18 +0200 mq: fix qtop failure when the series ends with guarded patches.
Patrick Mezard <pmezard@gmail.com> [Sun, 06 May 2007 23:44:18 +0200] rev 4408
mq: fix qtop failure when the series ends with guarded patches.
Sun, 06 May 2007 18:19:25 +0200 Test qtop breaking when series ends with guarded patches.
Patrick Mezard <pmezard@gmail.com> [Sun, 06 May 2007 18:19:25 +0200] rev 4407
Test qtop breaking when series ends with guarded patches.
Sun, 06 May 2007 16:40:53 +0200 simplemerge: flush stdout before writing to stderr.
Patrick Mezard <pmezard@gmail.com> [Sun, 06 May 2007 16:40:53 +0200] rev 4406
simplemerge: flush stdout before writing to stderr. Besides, stderr is not always unbuffered under win32 (when redirections occur for instance), and it should be flushed too.
Sun, 06 May 2007 16:40:53 +0200 Move win32 find_in_files from util_win32 to util.
Patrick Mezard <pmezard@gmail.com> [Sun, 06 May 2007 16:40:53 +0200] rev 4405
Move win32 find_in_files from util_win32 to util.
Thu, 03 May 2007 17:27:21 -0500 Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:27:21 -0500] rev 4404
Merge with stable
Thu, 03 May 2007 17:26:21 -0500 Merge with crew-stable
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:26:21 -0500] rev 4403
Merge with crew-stable
Thu, 03 May 2007 14:09:09 -0700 Update Windows build instructions.
Lee Cantey <lcantey@gmail.com> [Thu, 03 May 2007 14:09:09 -0700] rev 4402
Update Windows build instructions.
Thu, 03 May 2007 17:24:43 -0500 merge: reorganize some hunks in findcopies
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:24:43 -0500] rev 4401
merge: reorganize some hunks in findcopies
Thu, 03 May 2007 17:24:43 -0500 merge: simplify a check in checkcopies
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:24:43 -0500] rev 4400
merge: simplify a check in checkcopies
Thu, 03 May 2007 17:24:43 -0500 merge: expand and simplify the invalid handling for directory moves
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:24:43 -0500] rev 4399
merge: expand and simplify the invalid handling for directory moves
Thu, 03 May 2007 17:24:43 -0500 merge: fix a bug detecting directory moves
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:24:43 -0500] rev 4398
merge: fix a bug detecting directory moves When all the files in a directory are moved, it may be incorrectly marked as moved even if it contains subdirectories.
Thu, 03 May 2007 17:24:43 -0500 merge: clarify the findcopies code
Matt Mackall <mpm@selenic.com> [Thu, 03 May 2007 17:24:43 -0500] rev 4397
merge: clarify the findcopies code
Tue, 01 May 2007 13:23:32 -0700 mq: account for readheaders munging in qrefresh
Brendan Cully <brendan@kublai.com> [Tue, 01 May 2007 13:23:32 -0700] rev 4396
mq: account for readheaders munging in qrefresh
Tue, 01 May 2007 14:42:54 -0500 verify: hold write lock
Matt Mackall <mpm@selenic.com> [Tue, 01 May 2007 14:42:54 -0500] rev 4395
verify: hold write lock Verify will report spurious errors if commits or pulls happen during verify.
Mon, 30 Apr 2007 09:32:44 -0700 Also restore old rm -A behavior for inexact patterns
Brendan Cully <brendan@kublai.com> [Mon, 30 Apr 2007 09:32:44 -0700] rev 4394
Also restore old rm -A behavior for inexact patterns
Mon, 30 Apr 2007 09:13:27 -0700 Fix rm -A with no patterns, which I just broke.
Brendan Cully <brendan@kublai.com> [Mon, 30 Apr 2007 09:13:27 -0700] rev 4393
Fix rm -A with no patterns, which I just broke.
Mon, 30 Apr 2007 08:51:59 -0700 Make rm --after simply mark files as removed, unless --force is also given
Brendan Cully <brendan@kublai.com> [Mon, 30 Apr 2007 08:51:59 -0700] rev 4392
Make rm --after simply mark files as removed, unless --force is also given
Sun, 29 Apr 2007 18:17:35 -0700 Add hgwebdir.fcgi to contrib
Michael Gebetsroither <michael.geb@gmx.at> [Sun, 29 Apr 2007 18:17:35 -0700] rev 4391
Add hgwebdir.fcgi to contrib
Sun, 29 Apr 2007 17:35:03 -0700 Flesh out bisect help text
Brendan Cully <brendan@kublai.com> [Sun, 29 Apr 2007 17:35:03 -0700] rev 4390
Flesh out bisect help text
Sun, 29 Apr 2007 12:33:24 -0500 Merge with crew
Matt Mackall <mpm@selenic.com> [Sun, 29 Apr 2007 12:33:24 -0500] rev 4389
Merge with crew
Thu, 26 Apr 2007 18:41:18 -0500 Merge with stable
Matt Mackall <mpm@selenic.com> [Thu, 26 Apr 2007 18:41:18 -0500] rev 4388
Merge with stable
Wed, 25 Apr 2007 13:35:18 -0500 hg serve: don't do DNS lookups
Matt Mackall <mpm@selenic.com> [Wed, 25 Apr 2007 13:35:18 -0500] rev 4387
hg serve: don't do DNS lookups
Sat, 28 Apr 2007 17:55:45 -0300 Fix minor mismerge.
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 28 Apr 2007 17:55:45 -0300] rev 4386
Fix minor mismerge. The caching of umask ended up being duplicated.
Sat, 28 Apr 2007 17:55:45 -0300 run-tests.py: pass -L/--label to simplemerge
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 28 Apr 2007 17:55:45 -0300] rev 4385
run-tests.py: pass -L/--label to simplemerge This should give us conflict markers that don't change from one run to another. Remove some sed's/egrep's from some tests.
Thu, 26 Apr 2007 23:58:18 -0700 Add notes about configuring a merge program
Lee Cantey <lcantey@gmail.com> [Thu, 26 Apr 2007 23:58:18 -0700] rev 4384
Add notes about configuring a merge program
Fri, 27 Apr 2007 16:04:17 -0700 Update copyright year and change to range
Lee Cantey <lcantey@gmail.com> [Fri, 27 Apr 2007 16:04:17 -0700] rev 4383
Update copyright year and change to range
Sat, 28 Apr 2007 11:53:36 +0200 Use patch.patch() when checking for patch availability.
Patrick Mezard <pmezard@gmail.com> [Sat, 28 Apr 2007 11:53:36 +0200] rev 4382
Use patch.patch() when checking for patch availability. The test is closer to what we want to know. It also makes sense when you deal with patched versions of patch() as most people do under win32.
(0) -3000 -1000 -300 -100 -50 -30 +30 +50 +100 +300 +1000 tip