Mercurial > hg
changeset 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 | 503e674fb545 |
| children | 3c738cb162bf |
| files | hgext/transplant.py tests/test-transplant.t |
| diffstat | 2 files changed, 19 insertions(+), 1 deletions(-) [+] |
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:
--- a/tests/test-transplant.t Thu May 10 18:52:07 2012 +0200 +++ b/tests/test-transplant.t Fri May 11 17:26:58 2012 +0200 @@ -120,7 +120,25 @@ 1 r2 0 r1 +test same-parent transplant with --log + $ hg clone -r 1 ../t ../sameparent + adding changesets + adding manifests + adding file changes + added 2 changesets with 2 changes to 2 files + updating to branch default + 2 files updated, 0 files merged, 0 files removed, 0 files unresolved + $ cd ../sameparent + $ hg transplant --log -s ../prune 5 + searching for changes + applying e234d668f844 + e234d668f844 transplanted to e07aea8ecf9c + $ hg log --template '{rev} {parents} {desc}\n' + 2 b1 + (transplanted from e234d668f844e1b1a765f01db83a32c0c7bfa170) + 1 r2 + 0 r1 remote transplant $ hg clone -r 1 ../t ../remote