equal
deleted
inserted
replaced
457 # hexlify nodes from outgoing, because we're going to parse |
457 # hexlify nodes from outgoing, because we're going to parse |
458 # parent[0] using revsingle below, and if the binary hash |
458 # parent[0] using revsingle below, and if the binary hash |
459 # contains special revset characters like ":" the revset |
459 # contains special revset characters like ":" the revset |
460 # parser can choke. |
460 # parser can choke. |
461 parent = [node.hex(n) for n in discovery.findcommonoutgoing( |
461 parent = [node.hex(n) for n in discovery.findcommonoutgoing( |
462 repo, other, [], force=opts.get('force')).missing[0:1]] |
462 repo, other, revs, force=opts.get('force')).missing[0:1]] |
463 else: |
463 else: |
464 if opts.get('force'): |
464 if opts.get('force'): |
465 raise util.Abort(_('--force only allowed with --outgoing')) |
465 raise util.Abort(_('--force only allowed with --outgoing')) |
466 |
466 |
467 if opts.get('continue', False): |
467 if opts.get('continue', False): |