- Feb 04, 2008
-
-
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.
-
Alexis S. L. Carvalho authored
Some systems require a seek (or flush) between read and write operations on the same file object. This should fix issue838.
-
Alexis S. L. Carvalho authored
Closes issue873.
-
Alexis S. L. Carvalho authored
This is needed to keep the code in keepalive.py from sharing the same connection between HTTP and HTTPS. 52ce0d6bc375 explains why we were using a single handler. This should fix issue892.
-
Alexis S. L. Carvalho authored
This should prevent the next patch from reopening an issue fixed by 0d94e4a3ddb4.
-
Alexis S. L. Carvalho authored
The current list of reserved names includes only mq control files. Also, reserve names starting with ".hg" (to avoid troubles with e.g. .hgignore and .hgtags), and with ".mq" (to allow future extensions). This should fix issue841.
-
Alexis S. L. Carvalho authored
We already disallow committing on top of an mq revision exactly to avoid losing this new revision during a qpop/qrefresh, so this can be seen as an additional safety check. If this is not enough to fix issue844, it should at least prevent it from happening.
-
Alexis S. L. Carvalho authored
-
Alexis S. L. Carvalho authored
This should avoid some tracebacks when the server sends some garbage.
-
Alexis S. L. Carvalho authored
-
- Jan 31, 2008
-
-
Matt Mackall authored
This eliminates just about all Mercurial dependencies in templater.py
-
Matt Mackall authored
-