amend: drop --branches, pick it from working directory
The amended changeset branch was picked either from --branch or from the
first parent, but the actual working directory branch was ignored. The
behaviour is changed so the amended revision branch is picked from the
intermediate revision, which branch comes from the usual working
directory rules. --branch is thus replaced by "hg branch".
-----------------------------------------------------
Vocabulary
-----------------------------------------------------
.. note:: all terminology is subject to change
:obsolete marker:
express a relation from 0..n new changesets to 1 old changeset
:obsolete changesets:
non public changeset which are target of a obsolete marker
:unstable changeset:
changeset not obsolete but with obsolete ancestor
:extinct changeset:
obsolete changeset without unstable descendant
:suspended changeset:
obsolete changeset with unstable descendant
:obsolete-parents:
previous versions of a changeset, through a direct obsolete marker.
:obsolete-children:
new versions of a changeset, through a direct obsolete marker.
:obsolete-ancestors:
previous versions of a changeset, through any number of obsolete marker
:obsolete-descendant:
new versions of a changeset, through any number of obsolete marker
:obsolete-diff:
diff between a changeset and it's obsolete parent
:obsolete-tip:
obsolete-descendants which are not obsolete themselves.
:conflicting changeset:
multiple obsolete-tip for an obsolete changeset through diverging obsolete
markers (no changeset split marker)