hgext3rd/topic/constants.py
author |
Anton Shestakov <av6@dwimlabs.net> |
|
Mon, 07 Oct 2019 14:38:56 +0700 |
branch | stable |
changeset 4891 |
a9929dd36405 |
parent 4814 |
48b30ff742cb
|
permissions |
-rw-r--r-- |
pick: don't create any successors when there were no changes (issue6093)
For example, when a changeset that user is trying to pick was already grafted
or rebased (and no obsmarkers were created), pick will naturally say that
there's no changes to commit and will not create the new commit. In that case
it should not mark any changeset as a successor of the picked changeset,
because the actual file changes were already there before picking.
Technically, pick could (and did before this patch) mark the wdir commit as a
successor of picked changeset (may be useful in the most trivial cases when
e.g. wdir is a graft of the required change), but there are cases when the
picked change is introduced in an ancestor of wdir, or even in multiple
ancestors piece by piece. Pick definitely shouldn't be trying to guess
something this complicated, so with this patch it always marks the picked
change as pruned if it gave no changes to commit.
4814
48b30ff742cb
python3: use format-source to run byteify-strings in .py files
Raphaël Gomès <rgomes@octobus.net>
diff
changeset
|
1 |
extrakey = b'topic' |
48b30ff742cb
python3: use format-source to run byteify-strings in .py files
Raphaël Gomès <rgomes@octobus.net>
diff
changeset
|
2 |
changekey = b'_rewrite_noise' |