Thomas Arendsen Hein <thomas@intevation.de> [Wed, 04 Oct 2006 22:07:03 +0200] rev 3254
merge with upstream
Brendan Cully <brendan@kublai.com> [Wed, 04 Oct 2006 12:39:51 -0700] rev 3253
patchbomb: update --attach to use cmdutil.make_filename
Matt Mackall <mpm@selenic.com> [Fri, 06 Oct 2006 16:55:11 -0500] rev 3252
merge: copy fixes and tests
Fix up "already seen" logic
Fix merge action in remote copy case
Add status message
Add lots of merge+copy/move test cases
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 19:08:04 -0500] rev 3251
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 3250
Make status -C work with merge+rename
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 15:43:27 -0500] rev 3249
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 3248
merge: reduce manifest copying
Matt Mackall <mpm@selenic.com> [Wed, 04 Oct 2006 14:09:26 -0500] rev 3247
merge: reorder dirstate update slightly for correctness
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
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 03 Oct 2006 11:54:11 +0200] rev 3240
Fix minor indentation problem in template-vars.txt
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 03 Oct 2006 11:53:35 +0200] rev 3239
Install all files/subdirectories below templates.
This is needed because styles are now in their own subdirectory.