transaction: add missing newline to message
authorMichael O'Connor <moconnor@janestreet.com>
Tue, 14 Apr 2015 10:59:26 -0400
changeset 24721 774ee9800146
parent 24720 c560d8c68791
child 24722 02a5618e2fbf
transaction: add missing newline to message Add a missing newline to the "journal was created by a different version of Mercurial" message.
i18n/ja.po
mercurial/transaction.py
--- a/i18n/ja.po	Sun Apr 05 13:16:46 2015 +0900
+++ b/i18n/ja.po	Tue Apr 14 10:59:26 2015 -0400
@@ -27151,8 +27151,8 @@
 msgid "couldn't read journal entry %r!\n"
 msgstr "ジャーナルファイル中のエントリ %r の解析に失敗\n"
 
-msgid "journal was created by a different version of Mercurial"
-msgstr "ジャーナルファイルは異なる版の mercurial で作成されたものです"
+msgid "journal was created by a different version of Mercurial\n"
+msgstr "ジャーナルファイルは異なる版の mercurial で作成されたものです\n"
 
 msgid "already have changeset "
 msgstr "既にあるリビジョンです "
--- a/mercurial/transaction.py	Sun Apr 05 13:16:46 2015 +0900
+++ b/mercurial/transaction.py	Tue Apr 14 10:59:26 2015 -0400
@@ -542,6 +542,6 @@
                         backupentries.append((l, f, b, bool(c)))
             else:
                 report(_("journal was created by a different version of "
-                         "Mercurial"))
+                         "Mercurial\n"))
 
     _playback(file, report, opener, vfsmap, entries, backupentries)