Thomas Arendsen Hein <thomas@intevation.de> [Thu, 05 Oct 2006 10:07:40 +0200] rev 3259
merge with upstream
Benoit Boissinot <benoit.boissinot@ens-lyon.org> [Thu, 05 Oct 2006 00:14:21 +0200] rev 3258
merge with crew
Jose M. Prieto <jmprieto@gmx.net> [Tue, 03 Oct 2006 12:33:22 +0200] rev 3257
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 3256
util.strdate: assume local time when no timezone specified
Jose M. Prieto <jmprieto@gmx.net> [Tue, 03 Oct 2006 12:33:14 +0200] rev 3255
util.strdate: compute timestamp using UTC, not local timezone
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