##// END OF EJS Templates
transplant: fix emptied changeset message...
Patrick Mezard -
r17320:0c3c65c0 stable
parent child Browse files
Show More
@@ -285,7 +285,7 b' class transplanter(object):'
285 n = repo.commit(message, user, date, extra=extra, match=m,
285 n = repo.commit(message, user, date, extra=extra, match=m,
286 editor=self.editor)
286 editor=self.editor)
287 if not n:
287 if not n:
288 self.ui.warn(_('%s: empty changeset') % revlog.hex(node))
288 self.ui.warn(_('skipping emptied changeset %s\n') % short(node))
289 return None
289 return None
290 if not merge:
290 if not merge:
291 self.transplants.set(n, node)
291 self.transplants.set(n, node)
@@ -629,6 +629,6 b' test transplanting a patch turning into '
629 $ hg transplant -s ../binarysource 2
629 $ hg transplant -s ../binarysource 2
630 searching for changes
630 searching for changes
631 applying 7a7d57e15850
631 applying 7a7d57e15850
632 7a7d57e158501e51588f5fd3288b491cac77e0d8: empty changeset (no-eol)
632 skipping emptied changeset 7a7d57e15850
633 $ cd ..
633 $ cd ..
634
634
General Comments 0
You need to be logged in to leave comments. Login now