Mercurial > public > mercurial-scm > hg-stable
diff hgext/transplant.py @ 16627:38c45a99be0b
transplant: manually transplant pullable changesets with --log
author | Levi Bard <levi@unity3d.com> |
---|---|
date | Fri, 11 May 2012 17:26:58 +0200 |
parents | ebf6d38c9063 |
children | 38caf405d010 |
line wrap: on
line diff
--- a/hgext/transplant.py Thu May 10 18:52:07 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: