Steve Borho <steve@borho.org> [Fri, 13 May 2011 19:46:36 -0500] rev 14328
simplemerge: do not allow binary files to abort an entire merge
When used as the default merge tool, or used as a --tool override,
the simplemerge script should not be allowed to raise a util.Abort
just because one of the files being merged is binary. Instead, return
1 and mark the file unresolved.
Javi Merino <cibervicho@gmail.com> [Sun, 15 May 2011 18:00:22 +0100] rev 14327
extdiff: grammar "allows to" -> "allows one to"
The verb to allow requires a direct object.
Lintian, a Debian tool to find common mistakes, reported it. I'm not a
native english speaker but I think this is correct.
Matt Mackall <mpm@selenic.com> [Sun, 15 May 2011 11:50:16 -0500] rev 14326
debugrevlog: add --dump flag to dump graphable per-revision statistics
Matt Mackall <mpm@selenic.com> [Sun, 15 May 2011 11:50:15 -0500] rev 14325
revlog: restore the base method
Brendan Cully <brendan@kublai.com> [Sat, 14 May 2011 22:07:58 -0700] rev 14324
Hardcoding ARCHFLAGS breaks the build against fink's python
Fink's python is either i386 or amd64, but not universal. Setting ARCHFLAGS to the
empty string produces a successful build against both OS X python and fink python.
The modules will no longer be universal -- if that is an issue, we can change the
test to extract ARCHFLAGS from distutils.sysconfig and remove ppc if necessary.
Sune Foldager <cryo@cyanite.org> [Sat, 14 May 2011 00:30:32 +0200] rev 14323
debugindex etc.: add --changelog and --manifest options
These open the changelog and manifest, respectively, directly so you don't
need to specify the path.
The options have been added to debugindex, debugdata and debugrevlog.
The patch also fixes some minor usage-related bugs.
Matt Mackall <mpm@selenic.com> [Fri, 13 May 2011 14:58:24 -0500] rev 14322
scmutil: drop aliases in cmdutil for match functions
Matt Mackall <mpm@selenic.com> [Fri, 13 May 2011 14:48:48 -0500] rev 14321
scmutil: drop some aliases in cmdutil