Mercurial > hg

changeset 21702:99db956b88ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Sun, 01 Jun 2014 16:01:01 -0700
parents c08a22bfa16e (current diff) dedb68a9532c (diff)
children 14514dd542aa
files mercurial/localrepo.py
diffstat 6 files changed, 16 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsigs	Fri May 30 11:53:10 2014 -0700
+++ b/.hgsigs	Sun Jun 01 16:01:01 2014 -0700
@@ -88,3 +88,4 @@
 3f83fc5cfe715d292069ee8417c83804f6c6c1e4 0 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
+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
--- a/.hgtags	Fri May 30 11:53:10 2014 -0700
+++ b/.hgtags	Sun Jun 01 16:01:01 2014 -0700
@@ -101,3 +101,4 @@
 3f83fc5cfe715d292069ee8417c83804f6c6c1e4 2.9.2
 564f55b251224f16508dd1311452db7780dafe2b 3.0-rc
 2195ac506c6ababe86985b932f4948837c0891b5 3.0
+269c80ee5b3cb3684fa8edc61501b3506d02eb10 3.0.1
--- a/i18n/de.po	Fri May 30 11:53:10 2014 -0700
+++ b/i18n/de.po	Sun Jun 01 16:01:01 2014 -0700
@@ -21,7 +21,7 @@
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
 "POT-Creation-Date: 2014-01-29 16:47+0100\n"
-"PO-Revision-Date: 2013-09-30 20:52+0100\n"
+"PO-Revision-Date: 2014-05-07 09:14+0200\n"
 "Last-Translator: Simon Heimberg <simohe@besonet.ch>\n"
 "Language-Team: \n"
 "Language: de\n"
@@ -3437,11 +3437,11 @@
 msgstr "hg fetch [QUELLE]"
 
 msgid "commands to sign and verify changesets"
-msgstr "Nutzt eine Programm um den Fehlerstatus zu bestimmen"
+msgstr "Kommandos um Änderungssätze zu signieren und Signaturen zu verifizieren"
 
 #, python-format
 msgid "%s Unknown key ID \"%s\"\n"
-msgstr ""
+msgstr "%s unbekannte Schlüssel-ID \"%s\"\n"
 
 #, python-format
 msgid "%s Bad signature from \"%s\"\n"
--- a/i18n/ja.po	Fri May 30 11:53:10 2014 -0700
+++ b/i18n/ja.po	Sun Jun 01 16:01:01 2014 -0700
@@ -149,8 +149,8 @@
 msgstr ""
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
-"POT-Creation-Date: 2014-04-30 22:52+0900\n"
-"PO-Revision-Date: 2014-04-30 23:08+0900\n"
+"POT-Creation-Date: 2014-05-30 19:32+0900\n"
+"PO-Revision-Date: 2014-05-30 19:43+0900\n"
 "Last-Translator: Japanese translation team <mercurial-ja@googlegroups.com>\n"
 "Language-Team: Japanese\n"
 "Language: ja\n"
@@ -8204,11 +8204,11 @@
 msgid "empty \"rev\" revision set - nothing to rebase\n"
 msgstr "--rev での指定対象が空です - 移動対象がありません\n"
 
-msgid "empty \"source\" revision set - nothing to rebase"
-msgstr "--soruce での指定対象が空です - 移動対象がありません"
-
-msgid "empty \"base\" revision set - can't compute rebase set"
-msgstr "--base での指定対象が空です - 移動対象を算出できません"
+msgid "empty \"source\" revision set - nothing to rebase\n"
+msgstr "--soruce での指定対象が空です - 移動対象がありません\n"
+
+msgid "empty \"base\" revision set - can't compute rebase set\n"
+msgstr "--base での指定対象が空です - 移動対象を算出できません\n"
 
 #, python-format
 msgid "nothing to rebase - %s is both \"base\" and destination\n"
--- a/i18n/zh_TW.po	Fri May 30 11:53:10 2014 -0700
+++ b/i18n/zh_TW.po	Sun Jun 01 16:01:01 2014 -0700
@@ -8,11 +8,10 @@
 "Project-Id-Version: Mercurial\n"
 "Report-Msgid-Bugs-To: <mercurial-devel@selenic.com>\n"
 "POT-Creation-Date: 2010-10-31 22:27+0100\n"
-"PO-Revision-Date: 2009-10-25 12:50+0100\n"
-"Last-Translator: Chia-Huan Wu <willie.tw@gmail.com>,"
-"leolarrel<leolarrel@gmail.com>\n"
+"PO-Revision-Date: 2014-05-07 09:20+0200\n"
+"Last-Translator: Chia-Huan Wu <willie.tw@gmail.com>,leolarrel<leolarrel@gmail.com>\n"
 "Language-Team: Traditional Chinese\n"
-"Language: \n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
--- a/mercurial/localrepo.py	Fri May 30 11:53:10 2014 -0700
+++ b/mercurial/localrepo.py	Sun Jun 01 16:01:01 2014 -0700
@@ -863,7 +863,7 @@
                 hint=_("run 'hg recover' to clean up transaction"))
 
         def onclose():
-            self.store.write(tr)
+            self.store.write(self._transref())
 
         self._writejournal(desc)
         renames = [(vfs, x, undoname(x)) for vfs, x in self._journalfiles()]