Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2011 14:30:53 -0500] rev 14834
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 05 Jul 2011 14:30:42 -0500] rev 14833
discovery: quiet note about heads
This was changing output on in/out -v for no good reason.
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 04 Jul 2011 19:53:39 -0300] rev 14832
patch: fix parsing patch files containing CRs not followed by LFs
Since
1e64e1e12195 , patch lines containing a CR not followed by a LF
would be incorrectly splitten, causing a failure to apply the patch.
Jim Hague <jim.hague@acm.org> [Tue, 05 Jul 2011 11:53:32 +0100] rev 14831
treediscovery: rename stop() in tests to fix failures on AIX.
It seems ksh, the default shell on AIX, does not permit the creation of a
function called stop(). test-treediscovery.t and test-treediscovery-legacy.t
both fail on AIX with error 'syntax error at line 25 : `(' unexpected'.
Fix by renaming stop() in the scripts to tstop(). For completeness
rename start() to tstart() to match. Both tests then pass on AIX.
Add check for the use of stop() in a shell script to check-code.
Idan Kamara <idankk86@gmail.com> [Mon, 04 Jul 2011 14:36:16 +0300] rev 14830
fileset: fix typo in binary() doc
Arne Babenhauserheide <bab@draketo.de> [Fri, 01 Jul 2011 22:50:36 +0200] rev 14829
help: fileset foo.lst was named files.lst
Matt Mackall <mpm@selenic.com> [Fri, 01 Jul 2011 13:59:09 -0500] rev 14828
merge with stable
Matt Mackall <mpm@selenic.com> [Fri, 01 Jul 2011 13:54:27 -0500] rev 14827
Added signature for changeset
de9eb6b1da4f
Matt Mackall <mpm@selenic.com> [Fri, 01 Jul 2011 13:54:25 -0500] rev 14826
Added tag 1.9 for changeset
de9eb6b1da4f
Mads Kiilerich <mads@kiilerich.com> [Fri, 01 Jul 2011 17:37:09 +0200] rev 14825
util: rename the util.localpath that uses url to urllocalpath (
issue2875)
util is never imported by any other name than util, so this is mostly just a
simple search and replace from util.localpath to util.urllocalpath (assuming
other uses of util.localpath already has been renamed).
Mads Kiilerich <mads@kiilerich.com> [Fri, 01 Jul 2011 18:13:48 +0200] rev 14824
tests: restore previous fix for date ambiguity in cvs test
017ab404e588 changed some sleeps after cvs update to sleeps before commit. I
don't know why that should work, but I have a machine where it doesn't work.
Commits regularly fails becuase cvs doesn't notice that a file has been
changed.
Restoring the previous sleep between the update and the edit makes cvs notice
the change.
Matt Mackall <mpm@selenic.com> [Thu, 30 Jun 2011 19:34:09 -0500] rev 14823
merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 30 Jun 2011 16:36:38 +0200] rev 14822
run-test: revert most of
439ed4721a6d, timeout uses fallback for terminate()
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 30 Jun 2011 16:25:05 +0200] rev 14821
run-tests: fallback to SIGTERM if subprocess.Popen does not have terminate()
Eli Carter <eli.carter@tektronix.com> [Thu, 30 Jun 2011 13:22:12 -0500] rev 14820
subrepo: correct revision in svn checkout
A Subversion subrepo checkout uses a url and --revision which does not do the
correct thing when specifying a revision of a branch that has since been
deleted and recreated. The checkout needs to specify the revision as URL@REV
instead.
Steve Borho <steve@borho.org> [Thu, 30 Jun 2011 12:55:19 -0500] rev 14819
wix: catch up with more added files
revsets: 1.7::tip and adds("mercurial/help/**")
1.7::tip and adds("mercurial/templates/**")
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 30 Jun 2011 20:37:32 -0300] rev 14818
i18n-pt_BR: translate template filter descriptions
Wagner Bruna <wbruna@softwareexpress.com.br> [Thu, 30 Jun 2011 20:05:23 -0300] rev 14817
i18n-ja: recover template translations from
15200b46165b
These translations were removed by
68a697421a57 because the original
strings were transfered to the docstrings (
264f292a0c6f) without
the corresponding sources being added to the Makefile for extraction.
Alexander Sauta <demosito@gmail.com> [Fri, 01 Jul 2011 00:26:45 +0400] rev 14816
i18n-ru: fixed mixed up msgid and msgstr in annotate
Alexander Sauta <demosito@gmail.com> [Fri, 01 Jul 2011 00:14:30 +0400] rev 14815
i18n-ru: translated missing strings for commands, some typos corrected
Wagner Bruna <wbruna@softwareexpress.com.br> [Wed, 29 Jun 2011 18:19:17 -0300] rev 14814
i18n-pt_BR: synchronized with
9adce4b38ed1
Matt Mackall <mpm@selenic.com> [Wed, 29 Jun 2011 16:05:59 -0500] rev 14813
merge with stable
Matt Mackall <mpm@selenic.com> [Wed, 29 Jun 2011 16:05:41 -0500] rev 14812
merge with i18n
FUJIWARA Katsunori <foozy@lares.dti.ne.jp> [Thu, 30 Jun 2011 01:55:14 +0900] rev 14811
i18n-ja: synchronized with
5c046e4b9652
Alexander Sauta <demosito@gmail.com> [Wed, 29 Jun 2011 19:04:03 +0400] rev 14810
i18n-ru: translated help for urls. Thus, all stock commands and help translated
Alexander Sauta <demosito@gmail.com> [Wed, 29 Jun 2011 16:14:26 +0400] rev 14809
i18n-ru: translated help for templating
Jens Bäckman <jens.backman@gmail.com> [Wed, 29 Jun 2011 09:24:45 +0200] rev 14808
i18n-sv: synchronized with
85857aa6e666
Wagner Bruna <wbruna@softwareexpress.com.br> [Tue, 28 Jun 2011 14:32:54 -0300] rev 14807
i18n-pt_BR: synchronized with
6ba51c81ff75
Alexander Sauta <demosito@gmail.com> [Tue, 28 Jun 2011 20:42:07 +0400] rev 14806
i18n-ru: translated help for multirevs-subrepos
Martin Geisler <mg@aragost.com> [Tue, 28 Jun 2011 10:06:56 +0200] rev 14805
i18n-da: translate hg.1.html header
Martin Geisler <mg@aragost.com> [Tue, 28 Jun 2011 10:02:39 +0200] rev 14804
i18n: merge with stable
Alexander Sauta <demosito@gmail.com> [Tue, 28 Jun 2011 00:34:49 +0400] rev 14803
i18n-ru: translated help for merge-tools
Alexander Sauta <demosito@gmail.com> [Mon, 27 Jun 2011 21:34:48 +0400] rev 14802
i18n-ru: translated help for hgignore
Martin Geisler <mg@aragost.com> [Tue, 28 Jun 2011 09:58:39 +0200] rev 14801
i18n-pt_BR: add lost translation used in test-i18n.t
Changeset
e6a6e7ebd585 replaced the Portuguese translation with the
English original and broke the test.
Martin Geisler <mg@aragost.com> [Tue, 28 Jun 2011 09:42:45 +0200] rev 14800
i18n: merge with main
Martin Geisler <mg@aragost.com> [Tue, 28 Jun 2011 09:39:58 +0200] rev 14799
i18n: merge with main
Alexander Sauta <demosito@gmail.com> [Tue, 28 Jun 2011 00:38:59 +0400] rev 14798
merge with stable
Alexander Sauta <demosito@gmail.com> [Tue, 28 Jun 2011 00:34:49 +0400] rev 14797
i18n-ru: translated help for merge-tools
Alexander Sauta <demosito@gmail.com> [Mon, 27 Jun 2011 21:34:48 +0400] rev 14796
i18n-ru: translated help for hgignore
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 27 Jun 2011 15:12:41 -0300] rev 14795
i18n-pt_BR: synchronized with
72e4fcb43227
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 27 Jun 2011 15:09:55 -0300] rev 14794
i18n-ru: drop executable bit from .po file
Martin Geisler <mg@lazybytes.net> [Mon, 27 Jun 2011 19:11:34 +0200] rev 14793
merge with stable
Martin Geisler <mg@lazybytes.net> [Mon, 27 Jun 2011 19:10:45 +0200] rev 14792
i18n: merge with main
This includes four i18n changesets transplanted from the default
branch to the stable branch since they were made after the freeze.
Alexander Sauta <demosito@gmail.com> [Thu, 23 Jun 2011 10:41:33 +0400] rev 14791
i18n-ru: glossary translated
Alexander Sauta <demosito@gmail.com> [Wed, 22 Jun 2011 02:47:03 +0400] rev 14790
i18n-ru: tranlated docstrings from filesets added in
1575dc5d399a
Alexander Sauta <demosito@gmail.com> [Wed, 22 Jun 2011 02:09:23 +0400] rev 14789
i18n-ru: translated help for extensions and filesets
Alexander Sauta <demosito@gmail.com> [Tue, 21 Jun 2011 01:49:45 +0400] rev 14788
i18n-ru: translated new config.txt
Martin Geisler <mg@lazybytes.net> [Mon, 27 Jun 2011 19:06:18 +0200] rev 14787
i18n: merge with main