Show More
@@ -454,8 +454,12 b' def histedit(ui, repo, *parent, **opts):' | |||||
454 | if revs: |
|
454 | if revs: | |
455 | revs = [repo.lookup(rev) for rev in revs] |
|
455 | revs = [repo.lookup(rev) for rev in revs] | |
456 |
|
456 | |||
457 | parent = discovery.findcommonoutgoing( |
|
457 | # hexlify nodes from outgoing, because we're going to parse | |
458 | repo, other, [], force=opts.get('force')).missing[0:1] |
|
458 | # parent[0] using revsingle below, and if the binary hash | |
|
459 | # contains special revset characters like ":" the revset | |||
|
460 | # parser can choke. | |||
|
461 | parent = [node.hex(n) for n in discovery.findcommonoutgoing( | |||
|
462 | repo, other, [], force=opts.get('force')).missing[0:1]] | |||
459 | else: |
|
463 | else: | |
460 | if opts.get('force'): |
|
464 | if opts.get('force'): | |
461 | raise util.Abort(_('--force only allowed with --outgoing')) |
|
465 | raise util.Abort(_('--force only allowed with --outgoing')) |
General Comments 0
You need to be logged in to leave comments.
Login now