view contrib/plan9/README @ 38280:2ec44160165d

graft: add a new `--stop` flag to stop interrupted graft

This patch adds a new flag `--stop` to `hg graft` command which stops the
interrupted graft.

The `--stop` flag takes back you to the last successful step i.e. it will keep
your grafted commits, it will just clear the mergestate and interrupted graft
state.

The `--stop` is different from `--abort` flag as the latter also undoes all the
work done till now which is sometimes not what the user wants.

Suppose you grafted a lot of changesets, you encountered conflicts, you resolved
them, did `hg graft --continue`, again encountered conflicts, continue, again
encountered conflicts. Now you are tired of solving merge conflicts and want to
resume this sometimes later. If you use the `--abort` functionality, it will
strip your already grafted changesets, making you loose the work you have done
resolving merge conflicts.

A general goal related to this flag is to add this flag to `rebase` and
`histedit` too. The evolve command already has this --stop flag.

Tests are added for the new flag.

.. feature::

   `hg graft` now has a `--stop` flag to stop interrupted graft.

Differential Revision: https://phab.mercurial-scm.org/D3668

Mercurial for Plan 9 from Bell Labs
===================================

This directory contains support for Mercurial on Plan 9 from Bell Labs
platforms. It is assumed that the version of Python running on these
systems supports the ANSI/POSIX Environment (APE). At the time of this
writing, the bichued/python port is the most commonly installed version
of Python on these platforms. If a native port of Python is ever made,
some minor modification will need to be made to support some of the more
esoteric requirements of the platform rather than those currently made
(cf. posix.py).

By default, installations will have the factotum extension enabled; this
extension permits factotum(4) to act as an authentication agent for
HTTP repositories. Additionally, an extdiff command named 9diff is
enabled which generates diff(1) compatible output suitable for use with
the plumber(4).

Commit messages are plumbed using E if no editor is defined; users must
update the plumbed file to continue, otherwise the hg process must be
interrupted.

Some work remains with regard to documentation. Section 5 manual page
references for hgignore and hgrc need to be re-numbered to section 6 (file
formats) and a new man page writer should be written to support the
Plan 9 man macro set. Until these issues can be resolved, manual pages
are elided from the installation.

Basic install:

  % mk install      # do a system-wide install
  % hg debuginstall # sanity-check setup
  % hg              # see help

A proto(2) file is included in this directory as an example of how a
binary distribution could be packaged, ostensibly with contrib(1).

See https://mercurial-scm.org/ for detailed installation
instructions, platform-specific notes, and Mercurial user information.