Show More
@@ -703,7 +703,7 b' def _dotransplant(ui, repo, *revs, **opt' | |||||
703 |
|
703 | |||
704 | tf = tp.transplantfilter(repo, source, p1) |
|
704 | tf = tp.transplantfilter(repo, source, p1) | |
705 | if opts.get('prune'): |
|
705 | if opts.get('prune'): | |
706 |
prune = set(source. |
|
706 | prune = set(source[r].node() | |
707 | for r in scmutil.revrange(source, opts.get('prune'))) |
|
707 | for r in scmutil.revrange(source, opts.get('prune'))) | |
708 | matchfn = lambda x: tf(x) and x not in prune |
|
708 | matchfn = lambda x: tf(x) and x not in prune | |
709 | else: |
|
709 | else: | |
@@ -712,7 +712,7 b' def _dotransplant(ui, repo, *revs, **opt' | |||||
712 | revmap = {} |
|
712 | revmap = {} | |
713 | if revs: |
|
713 | if revs: | |
714 | for r in scmutil.revrange(source, revs): |
|
714 | for r in scmutil.revrange(source, revs): | |
715 |
revmap[int(r)] = source. |
|
715 | revmap[int(r)] = source[r].node() | |
716 | elif opts.get('all') or not merges: |
|
716 | elif opts.get('all') or not merges: | |
717 | if source != repo: |
|
717 | if source != repo: | |
718 | alltransplants = incwalk(source, csets, match=matchfn) |
|
718 | alltransplants = incwalk(source, csets, match=matchfn) |
General Comments 0
You need to be logged in to leave comments.
Login now