Show More
@@ -625,8 +625,14 b' def transplant(ui, repo, *revs, **opts):' | |||
|
625 | 625 | if sourcerepo: |
|
626 | 626 | peer = hg.peer(repo, opts, ui.expandpath(sourcerepo)) |
|
627 | 627 | heads = map(peer.lookup, opts.get('branch', ())) |
|
628 | target = set(heads) | |
|
629 | for r in revs: | |
|
630 | try: | |
|
631 | target.add(peer.lookup(r)) | |
|
632 | except error.RepoError: | |
|
633 | pass | |
|
628 | 634 | source, csets, cleanupfn = bundlerepo.getremotechanges(ui, repo, peer, |
|
629 |
onlyheads= |
|
|
635 | onlyheads=sorted(target), force=True) | |
|
630 | 636 | else: |
|
631 | 637 | source = repo |
|
632 | 638 | heads = map(source.lookup, opts.get('branch', ())) |
@@ -313,13 +313,11 b' remote transplant with pull' | |||
|
313 | 313 | 0 r1 |
|
314 | 314 | |
|
315 | 315 | remote transplant without pull |
|
316 | (I'm pretty sure this test is actually pulling, | |
|
317 | It was using "2" and "4" (as the previous transplant used to) which referenced | |
|
316 | (It was using "2" and "4" (as the previous transplant used to) which referenced | |
|
318 | 317 | revision different from one run to another) |
|
319 | 318 | |
|
320 | 319 | $ hg pull -q http://localhost:$HGPORT/ |
|
321 | 320 | $ hg transplant -s http://localhost:$HGPORT/ 8d9279348abb 722f4667af76 |
|
322 | searching for changes | |
|
323 | 321 | skipping already applied revision 2:8d9279348abb |
|
324 | 322 | applying 722f4667af76 |
|
325 | 323 | 722f4667af76 transplanted to 76e321915884 |
General Comments 0
You need to be logged in to leave comments.
Login now