[PATCH 2 of 2] transplant: manually transplant pullable changesets with --log

Levi Bard taktaktaktaktaktaktaktaktaktak at gmail.com
Fri May 11 10:29:54 CDT 2012


# HG changeset patch
# User Levi Bard <levi at unity3d.com>
# Date 1336750018 -7200
# Node ID ea07de339c6bd945e34be93331e715b9ee4034e4
# Parent  253c456e9ba5a7e3dea677dc2c87bb6afdec9a42
transplant: manually transplant pullable changesets with --log

diff -r 253c456e9ba5 -r ea07de339c6b hgext/transplant.py
--- a/hgext/transplant.py	Fri May 11 17:25:08 2012 +0200
+++ b/hgext/transplant.py	Fri May 11 17:26:58 2012 +0200
@@ -124,7 +124,7 @@
                     continue
 
                 parents = source.changelog.parents(node)
-                if not opts.get('filter'):
+                if not (opts.get('filter') or opts.get('log')):
                     # If the changeset parent is the same as the
                     # wdir's parent, just pull it.
                     if parents[0] == p1:


More information about the Mercurial-devel mailing list