equal
deleted
inserted
replaced
5452 with wlock: |
5452 with wlock: |
5453 pullopargs.update(opts.get(b'opargs', {})) |
5453 pullopargs.update(opts.get(b'opargs', {})) |
5454 modheads = exchange.pull( |
5454 modheads = exchange.pull( |
5455 repo, |
5455 repo, |
5456 other, |
5456 other, |
|
5457 path=path, |
5457 heads=nodes, |
5458 heads=nodes, |
5458 force=opts.get(b'force'), |
5459 force=opts.get(b'force'), |
5459 bookmarks=opts.get(b'bookmark', ()), |
5460 bookmarks=opts.get(b'bookmark', ()), |
5460 opargs=pullopargs, |
5461 opargs=pullopargs, |
5461 confirm=opts.get(b'confirm'), |
5462 confirm=opts.get(b'confirm'), |