equal
deleted
inserted
replaced
4271 err = _("other repository doesn't support revision lookup, " |
4271 err = _("other repository doesn't support revision lookup, " |
4272 "so a rev cannot be specified.") |
4272 "so a rev cannot be specified.") |
4273 raise util.Abort(err) |
4273 raise util.Abort(err) |
4274 |
4274 |
4275 modheads = repo.pull(other, heads=revs, force=opts.get('force')) |
4275 modheads = repo.pull(other, heads=revs, force=opts.get('force')) |
4276 bookmarks.updatefromremote(ui, repo, other) |
4276 bookmarks.updatefromremote(ui, repo, other, source) |
4277 if checkout: |
4277 if checkout: |
4278 checkout = str(repo.changelog.rev(other.lookup(checkout))) |
4278 checkout = str(repo.changelog.rev(other.lookup(checkout))) |
4279 repo._subtoppath = source |
4279 repo._subtoppath = source |
4280 try: |
4280 try: |
4281 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout) |
4281 ret = postincoming(ui, repo, modheads, opts.get('update'), checkout) |