Nicolas Dumazet <nicdumz.commits@gmail.com> [Tue, 19 Oct 2010 20:20:10 +0900] rev 12758
tags: do not fail if tags.cache is corrupted (issue2444)
This file is not critical for hg, so we can safely
swallow the ValueError
Dan Villiom Podlaski Christiansen <danchr@gmail.com> [Sun, 10 Oct 2010 09:50:25 -0500] rev 12757
merge: make 'diverging renames' diagnostic a more helpful note.
See the Hg Book on why we actually want to detect this case:
http://hgbook.red-bean.com/read/mercurial-in-daily-use.html#id364290
Before:
$ hg up deadbeef
warning: detected divergent renames of X to:
...
After:
$ hg up deadbeef
note: possible conflict - X was renamed multiple times to:
...
No functionality change.
Erik Zielke <ez@aragost.com> [Mon, 18 Oct 2010 14:37:52 +0200] rev 12756
gendoc: refactor get_cmd
Refactors the get_cmd to take the table as argument, instad
of just referencing the global table, thereby enabling reuse
for extension command tables.
Erik Zielke <ez@aragost.com> [Mon, 18 Oct 2010 14:37:50 +0200] rev 12755
mq: switched to `` around * * *
So it can be parsed by rst.
Adrian Buehlmann <adrian@cadifra.com> [Sun, 17 Oct 2010 00:45:34 +0200] rev 12754
Revert: capitalization doc fix
Mads Kiilerich <mads@kiilerich.com> [Tue, 19 Oct 2010 03:56:20 +0200] rev 12753
subrepo: abort instead of pushing/pulling to the repo itself
_abssource will now abort (or return None) in the rare cases where no push/pull
path can be found.
Mads Kiilerich <mads@kiilerich.com> [Tue, 19 Oct 2010 03:55:28 +0200] rev 12752
subrepo: rename relpath to subrelpath and introduce reporelpath
Mads Kiilerich <mads@kiilerich.com> [Tue, 19 Oct 2010 03:55:06 +0200] rev 12751
mdiff: carriage return (\r) is also ignorable whitespace
Steve Borho <steve@borho.org> [Fri, 15 Oct 2010 23:00:45 -0500] rev 12750
merge: add --tool argument to merge and resolve
These arguments are shorthand for --config ui.merge, but they also
override HGMERGE if it is found in the user's environment.
timeless <timeless@gmail.com> [Sun, 17 Oct 2010 14:00:01 +0300] rev 12749
patchbomb: move command option help from the extension (patchbomb) to the command (email)
Steve Losh <steve@stevelosh.com> [Sun, 17 Oct 2010 13:24:37 -0400] rev 12748
alias: fail gracefully when invalid global options are given (issue2442)
This patch modifies the check for shell aliases to prevent crashing when an invalid
global option is given.
When an invalid global option is given the check will simply return and let the
normal error handling for this case happen.
Paul Molodowitch <pm@stanfordalumni.org> [Thu, 07 Oct 2010 13:44:17 -0700] rev 12747
bookmarks: better fix for issue2016 (lookup infinite recursion)
741290486877 partially reverted by Patrick Mézard <pmezard@gmail.com>
timeless <timeless@gmail.com> [Mon, 02 Aug 2010 07:15:47 +0300] rev 12746
merge/progress: marking strings for localization
timeless <timeless@gmail.com> [Mon, 02 Aug 2010 07:15:47 +0300] rev 12745
verify/progress: using gerund to indicate action and adding units