Mercurial > hg-stable

diff mercurial/bundle2.py @ 35470:7906354cbc68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debug: add newlines at the end of three locations that appear to need it Differential Revision: https://phab.mercurial-scm.org/D1720
author Kyle Lippincott <spectral@google.com>
date Mon, 18 Dec 2017 17:33:43 -0800
parents 496154e41968
children 2f54a3e228ff
line wrap: on
line diff
--- a/mercurial/bundle2.py	Mon Dec 18 17:33:08 2017 -0800
+++ b/mercurial/bundle2.py	Mon Dec 18 17:33:43 2017 -0800
@@ -2056,7 +2056,7 @@
     # The mergemarkers call will crash if marker creation is not enabled.
     # we want to avoid this if the part is advisory.
     if not inpart.mandatory and op.repo.obsstore.readonly:
-        op.repo.ui.debug('ignoring obsolescence markers, feature not enabled')
+        op.repo.ui.debug('ignoring obsolescence markers, feature not enabled\n')
         return
     new = op.repo.obsstore.mergemarkers(tr, markerdata)
     op.repo.invalidatevolatilesets()