# HG changeset patch # User Patrick Mezard # Date 2012-08-01 12:08:19 # Node ID 0c3c65c0d3fc701cb26ad010d6da4005fcd7e6a2 # Parent a189d4470a341df1f2dd5749eaeb9e94460cf281 transplant: fix emptied changeset message - Append an EOL - State the changeset is skipped diff --git a/hgext/transplant.py b/hgext/transplant.py --- a/hgext/transplant.py +++ b/hgext/transplant.py @@ -285,7 +285,7 @@ class transplanter(object): 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) diff --git a/tests/test-transplant.t b/tests/test-transplant.t --- a/tests/test-transplant.t +++ b/tests/test-transplant.t @@ -629,6 +629,6 @@ test transplanting a patch turning into $ hg transplant -s ../binarysource 2 searching for changes applying 7a7d57e15850 - 7a7d57e158501e51588f5fd3288b491cac77e0d8: empty changeset (no-eol) + skipping emptied changeset 7a7d57e15850 $ cd ..