equal
deleted
inserted
replaced
469 |
469 |
470 Use "min(outgoing() and ::.)" or similar revset specification |
470 Use "min(outgoing() and ::.)" or similar revset specification |
471 instead of --outgoing to specify edit target revision exactly in |
471 instead of --outgoing to specify edit target revision exactly in |
472 such ambiguous situation. See :hg:`help revsets` for detail about |
472 such ambiguous situation. See :hg:`help revsets` for detail about |
473 selecting revisions. |
473 selecting revisions. |
|
474 |
|
475 Returns 0 on success, 1 if user intervention is required (not only |
|
476 for intentional "edit" command, but also for resolving unexpected |
|
477 conflicts). |
474 """ |
478 """ |
475 # TODO only abort if we try and histedit mq patches, not just |
479 # TODO only abort if we try and histedit mq patches, not just |
476 # blanket if mq patches are applied somewhere |
480 # blanket if mq patches are applied somewhere |
477 mq = getattr(repo, 'mq', None) |
481 mq = getattr(repo, 'mq', None) |
478 if mq and mq.applied: |
482 if mq and mq.applied: |