Steve Borho <steve@borho.org> [Mon, 04 Feb 2008 19:38:34 -0600] rev 6025
filemerge: wrap quotes around tool path
Christian Ebert <blacktrash@gmx.net> [Mon, 04 Feb 2008 21:08:45 +0100] rev 6024
keyword: nokwcommands, restricted string variables at top level
- prettier syntax conforming eg. to commands.norepo
- possibly easier to hook from outside
Christian Ebert <blacktrash@gmx.net> [Mon, 04 Feb 2008 18:27:36 +0100] rev 6023
keyword: split line continuation in 2 steps (style)
Christian Ebert <blacktrash@gmx.net> [Mon, 04 Feb 2008 18:27:36 +0100] rev 6022
keyword: add empty_ok argument to kwrepo.commit
Christian Ebert <blacktrash@gmx.net> [Mon, 04 Feb 2008 18:27:36 +0100] rev 6021
keyword: allow keyword expansion on clone
If [keyword] filename patterns are specified in a global hgrc
keywords will be expanded in clone.
This behaviour is more consistent but also more dangerous.
Specifying global, and thus more complicted, [keyword] patterns
might slow things down as well.
Mention this in help?
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 05 Feb 2008 15:59:10 +0100] rev 6020
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 05 Feb 2008 15:54:42 +0100] rev 6019
cleanly abort on unknown archive type (issue966)
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 05 Feb 2008 14:34:46 +0100] rev 6018
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Tue, 05 Feb 2008 14:02:03 +0100] rev 6017
hgweb: fix search skipping tip
dhruva <dhruvakm@gmail.com> [Mon, 04 Feb 2008 09:56:01 -0600] rev 6016
filemerge: fix pattern matching
Lee Cantey <lcantey@gmail.com> [Sun, 03 Feb 2008 23:58:02 -0800] rev 6015
filemerge: fix path to working file when fixeol is enabled
Matt Mackall <mpm@selenic.com> [Mon, 04 Feb 2008 09:53:10 -0600] rev 6014
mergetools: correct vim typo
Matt Mackall <mpm@selenic.com> [Mon, 04 Feb 2008 09:51:56 -0600] rev 6013
filemerge: handle missing regappend
Lee Cantey <lcantey@gmail.com> [Sun, 03 Feb 2008 23:08:16 -0800] rev 6012
util_win32: add missing valname param to query_val function
Steve Borho <steve@borho.org> [Sun, 03 Feb 2008 22:27:53 -0600] rev 6011
filemerge: two fixes for kdiff3 example configuration
Steve Borho <steve@borho.org> [Thu, 31 Jan 2008 22:32:11 -0600] rev 6010
add merge sections to hgrc.5
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6009
filemerge: remove the hgmerge script
This is now better handled using [merge-tools] and [merge-patterns] in hgrc.
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6008
filemerge: add an example set of global settings for common merge tools
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6007
filemerge: add config item for GUI tools
<tool>.gui indicates whether a tool requires a GUI to run
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6006
merge: add registry look up bits to tool search
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6005
merge: add support for tool EOL fixups
specified with merge-tools:<tool>.fixeol=True
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6004
merge: allow smarter tool configuration
Add [merge-tool] hgrc section with:
<tool>.executable = name or path (<tool>)
<tool>.args = args with $local/base/other/output ($local $base $other)
<tool>.priority = priority (default 0)
<tool>.binary = handles binary (False)
<tool>.symlink = handles symlinks (False)
<tool>.checkconflict = check for conflict markers (False)
<tool>.premerge = try internal simplemerge (True if not binary or symlink)
Four built-in tools: internal:{merge,local,other,fail}
Add [merge-patterns] section of the form:
<pattern> = <tool>
Priority of settings is:
HGMERGE
merge-patterns
ui:merge
merge-tools by priority
hgmerge, if it can be found
Changes:
unsuccessful merges leave .orig files
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6003
filemerge: pull file-merging code into its own module
Matt Mackall <mpm@selenic.com> [Sun, 03 Feb 2008 19:29:05 -0600] rev 6002
merge: move the bulk of simplemerge into core
- keep existing simplemerge command in contrib
- clean up test interface
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sun, 03 Feb 2008 21:47:07 -0200] rev 6001
merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 02 Feb 2008 21:01:43 +0100] rev 6000
test-serve: wait before killing to always hide the "killed!" message.
Without the sleeps slower systems never display never display "killed!"
while faster systems sometimes or nearly always display it.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 02 Feb 2008 14:55:14 +0100] rev 5999
Mention 'hg update' to switch branches in help for branch and branches.
Thomas Arendsen Hein <thomas@intevation.de> [Sat, 02 Feb 2008 14:49:31 +0100] rev 5998
Clarify help for hg status and make it consistent.
Bryan O'Sullivan <bos@serpentine.com> [Fri, 01 Feb 2008 13:31:46 -0800] rev 5997
profile: expand PID in output file name
Bryan O'Sullivan <bos@serpentine.com> [Fri, 01 Feb 2008 13:11:03 -0800] rev 5996
convert: allow synthetic history to be spliced in.
Useful for recreating history in the face of SVN lossage.