Patrick Mezard <pmezard@gmail.com> [Tue, 12 Feb 2008 23:35:44 +0100] rev 6084
Document and fix tla/baz conversion tests
Patrick Mezard <pmezard@gmail.com> [Tue, 12 Feb 2008 23:35:35 +0100] rev 6083
convert: detect baz before tla
The former seems to handle repositories built by the latter, the opposite is not true.
Christian Ebert <blacktrash@gmx.net> [Tue, 12 Feb 2008 21:44:56 +0100] rev 6082
keyword: add glog to nokwcommands
Christian Ebert <blacktrash@gmx.net> [Sun, 10 Feb 2008 08:25:09 +0100] rev 6081
keyword: enable all monkey patches using _kwtemplater at reposetup
- no need for try-except block
- underscore prefix for private methods
- add doc strings
Maxim Dounin <mdounin@mdounin.ru> [Tue, 12 Feb 2008 19:07:45 +0300] rev 6080
hgweb: disable cgitb by default
Aleix Conchillo Flaque <aleix@member.fsf.org> [Tue, 12 Feb 2008 11:35:06 +0100] rev 6079
convert: added GNU Arch (tla) tests and related fixes
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