##// END OF EJS Templates
py3: fix bundle heads to be consumable more than once
Yuya Nishihara -
r38616:afef1e36 @72 default
parent child Browse files
Show More
@@ -32,8 +32,10 b' test-branch-option.t'
32 test-branch-tag-confict.t
32 test-branch-tag-confict.t
33 test-branches.t
33 test-branches.t
34 test-bundle-phases.t
34 test-bundle-phases.t
35 test-bundle-r.t
35 test-bundle-type.t
36 test-bundle-type.t
36 test-bundle-vs-outgoing.t
37 test-bundle-vs-outgoing.t
38 test-bundle.t
37 test-bundle2-multiple-changegroups.t
39 test-bundle2-multiple-changegroups.t
38 test-bundle2-pushback.t
40 test-bundle2-pushback.t
39 test-cappedreader.py
41 test-cappedreader.py
@@ -1220,7 +1220,7 b' def bundle(ui, repo, fname, dest=None, *'
1220 other = hg.peer(repo, opts, dest)
1220 other = hg.peer(repo, opts, dest)
1221 revs = [repo[r].hex() for r in revs]
1221 revs = [repo[r].hex() for r in revs]
1222 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1222 revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
1223 heads = revs and map(repo.lookup, revs) or revs
1223 heads = revs and pycompat.maplist(repo.lookup, revs) or revs
1224 outgoing = discovery.findcommonoutgoing(repo, other,
1224 outgoing = discovery.findcommonoutgoing(repo, other,
1225 onlyheads=heads,
1225 onlyheads=heads,
1226 force=opts.get('force'),
1226 force=opts.get('force'),
General Comments 0
You need to be logged in to leave comments. Login now