Alexander Sauta <demosito@gmail.com> [Mon, 04 Aug 2014 16:21:58 +0100] rev 22065
merge with i18n
Alexander Sauta <demosito@gmail.com> [Mon, 04 Aug 2014 18:51:18 +0400] rev 22064
i18n-ru: sync with ad56fc55cbc3 (fuzzies)
Alexander Sauta <demosito@gmail.com> [Fri, 01 Aug 2014 19:49:28 +0400] rev 22063
i18n-ru: sync with ad56fc55cbc3 (missing strings)
Vladimir Zakharov <zakharov.vv@gmail.com> [Wed, 30 Jul 2014 17:24:08 +0400] rev 22062
i18n-ru: update 'revisions' translation
Vladimir Zakharov <zakharov.vv@gmail.com> [Tue, 29 Jul 2014 19:08:41 +0400] rev 22061
i18n-ru: update 'revsets' translation
Alexander Sauta <demosito@gmail.com> [Wed, 16 Oct 2013 08:22:06 +0100] rev 22060
i18n-ru: prompts fixed
Matt Mackall <mpm@selenic.com> [Thu, 07 Aug 2014 14:58:12 -0500] rev 22059
whitespace: nuke triple blank lines in **.py
Matt Mackall <mpm@selenic.com> [Thu, 07 Aug 2014 14:57:20 -0500] rev 22058
check-commit: spot growing whitespace
We discourage PEP-8-style double blank lines, spot them creeping in.
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Thu, 24 Jul 2014 15:06:08 -0400] rev 22057
strip: remove -b/--backup codepaths
cset ba3bc6474bbf has removed this option. This commit just tidies the
code that was associated to it. It also fixes the internal calls to
the strip() function.
Before this change, any function that thought it would want as a final
safety to keep a partial backup bundle (bundling changes not linearly
related to the current change being stripped), had to explicitly pass
a backup="strip" option. With this change, these backups are always
kept in case of an exception and always removed if there is no
exception. Only full backups can be specified with backup=True or no
full backups with backup=False.
Jordi Gutiérrez Hermoso <jordigh@octave.org> [Thu, 07 Aug 2014 12:51:45 -0400] rev 22056
simplemerge: remove dead code
The following functions in simplemerge are dead code. I reran "make
test-merge*" after this change, and it passed. Looks like cruft that
we've been carrying since we nabbed this code from bzr.