D7631: absorb: allowing committed changes to be absorbed into their ancestors
mharbison72 (Matt Harbison)
phabricator at mercurial-scm.org
Thu Jan 2 15:21:04 EST 2020
mharbison72 added a comment.
mharbison72 added subscribers: martinvonz, mharbison72.
In D7631#112604 <https://phab.mercurial-scm.org/D7631#112604>, @rdamazio wrote:
> In D7631#112414 <https://phab.mercurial-scm.org/D7631#112414>, @quark wrote:
>> `--rev` seems ambiguous since there might be different kinds of revisions to specify - target and revisions to edit. Maybe something like `--source`, `--from`, `--target`?
> Done. Used `--source` to match `rebase`.
Is `--exact` from `hg fold` a better model? I don't feel strongly; I only mention it because `hg rebase -s` will take that revision and its descendants, so it's more like "stack" in my mind. I'm not sure how many other commands have `-s` off the top of my head, but @martinvonz
mentioned adding that to `hg fix` (probably in IRC), and I think mentioned the word "stack" in that context. So I might not be the only one to get slightly tripped up by that.
> I'm assuming no fundamental objections then? Removing the "RFC" part so it gets a proper review then.
I like it.
> + # default to working copy
> + ctx = scmutil.revsingle(repo, source, default=None)
Should it abort if multiple revisions are given, instead of picking the latest?
CHANGES SINCE LAST ACTION
To: rdamazio, #hg-reviewers
Cc: mharbison72, martinvonz, pulkit, quark, mercurial-devel
More information about the Mercurial-devel