Thomas Arendsen Hein <thomas@intevation.de> [Thu, 05 Oct 2006 10:07:40 +0200] rev 3258
merge with upstream
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 19:08:04 -0500] rev 3257
merge: fixes for merge+rename
findcopies: ignore files renamed on both branches
applyupdates: change remove flag to move
recordupdates: record copy actions, including local moves and deletions
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 17:59:27 -0500] rev 3256
Make status -C work with merge+rename
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 15:43:27 -0500] rev 3255
merge: add rename following
Currently disabled by default, enable with
[merge]
followcopies = 1
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 14:33:22 -0500] rev 3254
merge: reduce manifest copying
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 05 Oct 2006 00:14:21 +0200] rev 3253
merge with crew
Jose M. Prieto <jmprieto@gmx.net> [Tue, 03 Oct 2006 12:33:22 +0200] rev 3252
Add documentation about the date formats allowed in the command line
Jose M. Prieto <jmprieto@gmx.net> [Tue, 03 Oct 2006 12:33:18 +0200] rev 3251
util.strdate: assume local time when no timezone specified
Jose M. Prieto <jmprieto@gmx.net> [Tue, 03 Oct 2006 12:33:14 +0200] rev 3250
util.strdate: compute timestamp using UTC, not local timezone
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 04 Oct 2006 22:07:03 +0200] rev 3249
merge with upstream
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 14:09:26 -0500] rev 3248
merge: reorder dirstate update slightly for correctness
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 12:39:51 -0700] rev 3247
patchbomb: update --attach to use cmdutil.make_filename
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 11:14:33 -0700] rev 3246
hgweb: fix manifest link in gitweb summary
Thomas Arendsen Hein <thomas@intevation.de> [Wed, 04 Oct 2006 18:43:40 +0200] rev 3245
Corrected install location of manpages.
(man/manSECTION/ instead of man/man.SECTION/)
Wojciech Milkowski <wmilkowski@interia.pl> [Wed, 04 Oct 2006 18:06:03 +0200] rev 3244
Fix static file serving over HTTP on Windows.
Files to be served should be opened in binary mode.
Brendan Cully <brendan@kublai.com> [Tue, 03 Oct 2006 16:36:40 -0700] rev 3243
mq: update qfold to call delete correctly
Brendan Cully <brendan@kublai.com> [Tue, 03 Oct 2006 12:28:27 -0700] rev 3242
Make changectx.filenode raise repo.LookupError on failure
Brendan Cully <brendan@kublai.com> [Tue, 03 Oct 2006 12:14:33 -0700] rev 3241
Merge with upstream
Matt Mackall <mpm@selenic.com> [Tue, 03 Oct 2006 01:21:46 -0500] rev 3240
merge: use new working context object in update
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 22:03:14 -0500] rev 3239
contexts: add working dir and working file contexts
add workingctx
add workingfilectx
extend filectx.annotate for rev=None
extend filectx.ancestor
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 15:28:44 -0500] rev 3238
context: simplify repr methods
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 15:17:59 -0500] rev 3237
contexts: use __getattr__ rather than try/except in changectx
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 15:02:28 -0500] rev 3236
context: make filectx remember changectx in changectx.filectx
Matt Mackall <mpm@selenic.com> [Mon, 02 Oct 2006 14:23:38 -0500] rev 3235
Make filectx lazier
Lazy opening of filelog, lazy lookup of filenode and changeid