Thomas Arendsen Hein <thomas@intevation.de> [Wed, 18 Apr 2012 15:16:15 +0200] rev 16479
opener: coding style, use triple quotes for doc string
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Mon, 16 Apr 2012 01:11:29 +0900] rev 16478
icasefs: make case-folding collision detection as rename aware (issue3370)
if the file in target context causes case-folding collision against
one in working context, current implementation aborts merging with it,
even thouhg collding one (in target) is the file renamed from collided
one (in working).
this patch uses file copy information to know whether colliding file
is renamed from collided one or not: if so, collision between them is
ignored.
this patch also avoids collision detection between current context and
target context, if working context is clean (with --check/-c) or will
be clean (with --clean/-C).
Augie Fackler <raf@durin42.com> [Fri, 20 Apr 2012 11:08:14 -0500] rev 16477
bdiff.bdiff: release the GIL before doing expensive diff operations
This means that threaded webservers will have more of a chance of
doing something useful while the C extension is busy computing a
delta. Not doing this was causing problems for Google Code with a 25
meg text file that takes O(7 minutes) to deltify.
Kevin Bullock <kbullock@ringworld.org> [Fri, 20 Apr 2012 11:57:14 -0500] rev 16476
fetch: remove confusing reference to "authoritative" changes
Patrick Mezard <patrick@mezard.eu> [Fri, 20 Apr 2012 19:11:54 +0200] rev 16475
patch: be more tolerant with "Parent" header (issue3356)
Here is how export and mq write the "Parent" header:
mq: # Parent XXXXX
export: # Parent XXXXX
then import expects exactly 2 spaces while mq tolerates one or more. So "hg
import --exact" truncates mq generated patches header by one character and
fails. This patch aligns import "Parent" header parsing on mq one. I do not
expect spaces in parent references anytime soon.
Reported by Stefan Ring <stefanrin@gmail.com>
Adrian Buehlmann <adrian@cadifra.com> [Thu, 19 Apr 2012 17:08:12 +0200] rev 16474
pure/osutil: use Python's msvcrt module (issue3380)
As proposed by Christophe Gouiran <christophe.gouiran@eurocopter.com>
Idan Kamara <idankk86@gmail.com> [Thu, 19 Apr 2012 18:11:48 +0300] rev 16473
commands: add missing wlock to graft
Idan Kamara <idankk86@gmail.com> [Thu, 19 Apr 2012 18:11:42 +0300] rev 16472
dirstate: write branch file atomically
Idan Kamara <idankk86@gmail.com> [Thu, 19 Apr 2012 17:59:23 +0300] rev 16471
commands: add missing wlock to branch
Idan Kamara <idankk86@gmail.com> [Thu, 19 Apr 2012 17:59:23 +0300] rev 16470
commands: add missing wlock to backout