[PATCH] transaction: add missing newline to message

Michael O'Connor moconnor at janestreet.com
Tue Apr 14 15:44:12 UTC 2015


# HG changeset patch
# User Michael O'Connor <moconnor at janestreet.com>
# Date 1429023566 14400
#      Tue Apr 14 10:59:26 2015 -0400
# Node ID 1a08e4eb35d1a50ba870f76930a7fe0361a67dc6
# Parent  52ff737c63d2b2cb41185549aa9c35bc47317032
transaction: add missing newline to message

Add a missing newline to the "journal was created by a
different version of Mercurial" message.

diff --git a/i18n/ja.po b/i18n/ja.po
--- a/i18n/ja.po
+++ b/i18n/ja.po
@@ -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 "既にあるリビジョンです "
diff --git a/mercurial/transaction.py b/mercurial/transaction.py
--- a/mercurial/transaction.py
+++ b/mercurial/transaction.py
@@ -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)


More information about the Mercurial-devel mailing list