Aleix Conchillo Flaque <aleix@member.fsf.org> [Tue, 12 Feb 2008 10:38:34 +0100] rev 6078
convert: added gnu arch (baz) tests
Matt Mackall <mpm@selenic.com> [Mon, 11 Feb 2008 16:16:05 -0600] rev 6077
convert: try to be smarter about CVS branching
Better handles this case:
The output from cvsps -A -u --cvs-direct -q:
---------------------
PatchSet 1
Date: 2008/02/08 20:33:28
Author: fk
Branch: HEAD
Tag: (none)
Log:
initial
Members:
file_one:INITIAL->1.1
---------------------
PatchSet 2
Date: 2008/02/08 20:33:32
Author: fk
Branch: branch_name
Ancestor branch: HEAD
Tag: (none)
Log:
new file on branch
Members:
file_two:1.1->1.1.2.1
Steve Borho <steve@borho.org> [Wed, 06 Feb 2008 20:44:25 -0600] rev 6076
filemerge: more backwards compatible behavior for ui.merge
if ui.merge matches a tool in [merge-tools], it is used as the
default tool selection but may be rejected by binary or gui or
other checks. If ui.merge does not match a merge tool, it is
used unconditionally.
Steve Borho <steve@borho.org> [Wed, 06 Feb 2008 20:32:06 -0600] rev 6075
filemerge: add 'checkchanged' merge tool property
Matt Mackall <mpm@selenic.com> [Mon, 11 Feb 2008 16:13:43 -0600] rev 6074
ignore: split up huge patterns
Some versions of Python silently mishandle large regexes, so split
them up at a conservative 20k.
Thomas Arendsen Hein <thomas@intevation.de> [Sun, 10 Feb 2008 13:19:24 +0100] rev 6073
Use chmod 0770 and g+s instead of 02770 which does't work on Solaris 8.
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 04:24:59 +0100] rev 6072
keyword: no expansion in web diffs
Expansion in hgweb view of changesets and diffs is not needed and
only distracting.
Expansion stays enable in file and archive requests where it
makes sense.
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 01:53:19 +0100] rev 6071
keyword: make restrict entirely a kwtemplater attribute
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Feb 2008 22:50:53 +0100] rev 6070
keyword: declare globals in a more compact way
Christian Ebert <blacktrash@gmx.net> [Sat, 09 Feb 2008 22:37:51 +0100] rev 6069
keyword: avoid os import by using util.splitpath
Bryan O'Sullivan <bos@serpentine.com> [Sat, 09 Feb 2008 20:43:42 -0800] rev 6068
Automated merge with http://hg.west.spy.net/hg/hacks/hg
Dustin Sallings <dustin@spy.net> [Fri, 08 Feb 2008 21:31:03 -0800] rev 6067
Option to log to only show changesets within a specified branch.