changeset 17320:0c3c65c0d3fc stable

transplant: fix emptied changeset message - Append an EOL - State the changeset is skipped
author Patrick Mezard <patrick@mezard.eu>
date Wed, 01 Aug 2012 14:08:19 +0200
parents a189d4470a34
children f3fd9d6802b7
files hgext/transplant.py tests/test-transplant.t
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/transplant.py	Tue Jul 31 17:39:32 2012 +0200
+++ b/hgext/transplant.py	Wed Aug 01 14:08:19 2012 +0200
@@ -285,7 +285,7 @@
         n = repo.commit(message, user, date, extra=extra, match=m,
                         editor=self.editor)
         if not n:
-            self.ui.warn(_('%s: empty changeset') % revlog.hex(node))
+            self.ui.warn(_('skipping emptied changeset %s\n') % short(node))
             return None
         if not merge:
             self.transplants.set(n, node)
--- a/tests/test-transplant.t	Tue Jul 31 17:39:32 2012 +0200
+++ b/tests/test-transplant.t	Wed Aug 01 14:08:19 2012 +0200
@@ -629,6 +629,6 @@
   $ hg transplant -s ../binarysource 2
   searching for changes
   applying 7a7d57e15850
-  7a7d57e158501e51588f5fd3288b491cac77e0d8: empty changeset (no-eol)
+  skipping emptied changeset 7a7d57e15850
   $ cd ..