- Feb 05, 2008
-
-
Steve Borho authored
-
- Feb 04, 2008
-
-
Christian Ebert authored
- prettier syntax conforming eg. to commands.norepo - possibly easier to hook from outside
-
Christian Ebert authored
-
Christian Ebert authored
-
Christian Ebert authored
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?
-
- Feb 05, 2008
-
-
Thomas Arendsen Hein authored
-
Dirkjan Ochtman authored
-
Thomas Arendsen Hein authored
-
Dirkjan Ochtman authored
-
- Feb 04, 2008
-
-
dhruva authored
-
Lee Cantey authored
-
Matt Mackall authored
-
Matt Mackall authored
-
Lee Cantey authored
-
Steve Borho authored
-
- Feb 01, 2008
-
-
Steve Borho authored
-
- Feb 04, 2008
-
-
Matt Mackall authored
This is now better handled using [merge-tools] and [merge-patterns] in hgrc.
-
Matt Mackall authored
-
Matt Mackall authored
<tool>.gui indicates whether a tool requires a GUI to run
-
Matt Mackall authored
-
Matt Mackall authored
specified with merge-tools:<tool>.fixeol=True
-
Matt Mackall authored
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 authored
-
Matt Mackall authored
- keep existing simplemerge command in contrib - clean up test interface
-
- Feb 03, 2008
-
-
Alexis S. L. Carvalho authored
-
- Feb 02, 2008
-
-
Thomas Arendsen Hein authored
Without the sleeps slower systems never display never display "killed!" while faster systems sometimes or nearly always display it.
-
Thomas Arendsen Hein authored
-
Thomas Arendsen Hein authored
-
- Feb 01, 2008
-
-
Bryan O'Sullivan authored
-
Bryan O'Sullivan authored
Useful for recreating history in the face of SVN lossage.
-
Bryan O'Sullivan authored
-
Dirkjan Ochtman authored
-
Dirkjan Ochtman authored
-
Dirkjan Ochtman authored
-
- Jan 31, 2008
-
-
Christian Ebert authored
Also move encoding workaround completely into non binary condition.
-
Thomas Arendsen Hein authored
-
Armin Ronacher authored
-
- Feb 03, 2008
-
-
Alexis S. L. Carvalho authored
This should avoid a bad performance problem when the branch cache is not up-to-date, and hgweb can't write an updated version because it lacks permissions.
-
Alexis S. L. Carvalho authored
This will be important for the next patch, which may end up using this variable during an addchangegroup caused by strip.
-
Alexis S. L. Carvalho authored
This allows the transaction system to backup the correct file, so that a future rollback can do the right thing. This should fix issue963.
-