D7631: absorb: allowing committed changes to be absorbed into their ancestors

mjacob added a comment. In D7631#123321 , @mharbison72 wrote: > In D7631#123318 , @mjacob wrote: > >> I like the name `--from` for the option. It would also make sense in combination with a

D7631: absorb: allowing committed changes to be absorbed into their ancestors

mharbison72 added a comment. In D7631#123318 , @mjacob wrote: > I like the name `--from` for the option. It would also make sense in combination with a possible future `--into` option. The unfortunate thing about `--from` is that it

D7631: absorb: allowing committed changes to be absorbed into their ancestors

mjacob added a comment. I like the name `--from` for the option. It would also make sense in combination with a possible future `--into` option. INLINE COMMENTS > martinvonz wrote in absorb.py:993 > I think we should at least have a TODO about adding them. > > By the way, without the next

D7631: absorb: allowing committed changes to be absorbed into their ancestors

martinvonz added a comment. In D7631#120777 , @marmoute wrote: > As explained in this comment https://phab.mercurial-scm.org/D8030#120771 I find the idea of usign a changeset in place of the working copy interresting. However, this is a

D7631: absorb: allowing committed changes to be absorbed into their ancestors

marmoute added a comment. marmoute requested changes to this revision. As explained in this comment https://phab.mercurial-scm.org/D8030#120771 I find the idea of usign a changeset in place of the working copy interresting. However, this is a larger big UX change that seems to deserve a

D7631: absorb: allowing committed changes to be absorbed into their ancestors

This revision now requires changes to proceed. martinvonz added a comment. martinvonz requested changes to this revision. Sorry about the delay in responding. Please remember to rebase the series to the latest @ on hg-committed (the release notes are otherwise likely to conflict). INLINE

D7631: absorb: allowing committed changes to be absorbed into their ancestors

rdamazio updated this revision to Diff 19981. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7631?vs=19979=19981 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7631/new/ REVISION DETAIL

D7631: absorb: allowing committed changes to be absorbed into their ancestors

rdamazio updated this revision to Diff 19979. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7631?vs=19811=19979 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7631/new/ REVISION DETAIL

D7631: absorb: allowing committed changes to be absorbed into their ancestors

rdamazio marked 5 inline comments as done. rdamazio updated this revision to Diff 19811. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7631?vs=19048=19811 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7631/new/ REVISION

D7631: absorb: allowing committed changes to be absorbed into their ancestors

rdamazio added a comment. Sorry for the delay in replying here. INLINE COMMENTS > martinvonz wrote in absorb.py:993 > Maybe I'm also misunderstanding what this patch does in that case. `hg absorb > -r A` will not obsolete A? I would think it definitely should do that. > Perhaps the

D7631: absorb: allowing committed changes to be absorbed into their ancestors

mharbison72 added inline comments. INLINE COMMENTS > martinvonz wrote in test-absorb-rev.t:63 > nit: I think I've heard that `^` needs to be quoted on Windows, so maybe `-s > '.^+.'` That's true in cmd.exe, but msys doesn't seem to care. (That said, I thought check-code enforced quoting

D7631: absorb: allowing committed changes to be absorbed into their ancestors

martinvonz added a comment. In D7631#112604 , @rdamazio wrote: > In D7631#112414 , @quark wrote: > >> `--rev` seems ambiguous since there might be different kinds of revisions to specify -

D7631: absorb: allowing committed changes to be absorbed into their ancestors

pulkit added inline comments. INLINE COMMENTS > rdamazio wrote in absorb.py:993 > Done. Notice that *technically* the user could do such an absorb while in the > middle of a merge, but it sounds like a bad idea and inviting troubles, so > I'm letting it also disallow that case. I'll be

D7631: absorb: allowing committed changes to be absorbed into their ancestors

rdamazio added a comment. In D7631#114393 , @mharbison72 wrote: > In D7631#112604 , @rdamazio wrote: > >> In D7631#112414 , @quark wrote: >>

D7631: absorb: allowing committed changes to be absorbed into their ancestors

rdamazio marked an inline comment as done. rdamazio updated this revision to Diff 19048. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7631?vs=18873=19048 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7631/new/ REVISION

D7631: absorb: allowing committed changes to be absorbed into their ancestors

mharbison72 added a comment. mharbison72 added subscribers: martinvonz, mharbison72. In D7631#112604 , @rdamazio wrote: > In D7631#112414 , @quark wrote: > >> `--rev` seems ambiguous since there

D7631: absorb: allowing committed changes to be absorbed into their ancestors

rdamazio marked 2 inline comments as done. rdamazio updated this revision to Diff 18873. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7631?vs=18843=18873 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7631/new/ REVISION

D7631: absorb: allowing committed changes to be absorbed into their ancestors

pulkit added inline comments. INLINE COMMENTS > absorb.py:1113 > +absorb analyzes each change in your working directory (or the revision > given > +to `--rev`, if one is specified) and attempts to amend the changed lines > +into the changesets in your stack that first introduced

D7631: absorb: allowing committed changes to be absorbed into their ancestors

rdamazio updated this revision to Diff 18843. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7631?vs=18841=18843 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7631/new/ REVISION DETAIL

D7631: absorb: allowing committed changes to be absorbed into their ancestors

rdamazio added a comment. > Can you describe the feature a bit in the commit message. Specific things which I feel are missing: Done > Also, it will be nice if you add an entry in releasenotes. Done INLINE COMMENTS > pulkit wrote in absorb.py:993 > need to do more checks here

D7631: absorb: allowing committed changes to be absorbed into their ancestors

rdamazio edited the summary of this revision. rdamazio marked 2 inline comments as done. rdamazio updated this revision to Diff 18841. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7631?vs=18728=18841 BRANCH default CHANGES SINCE LAST ACTION

D7631: absorb: allowing committed changes to be absorbed into their ancestors

pulkit added a comment. Can you describe the feature a bit in the commit message. Specific things which I feel are missing: - what happens to wdir changes - what happens if source is a commit is not a head I understand them but after reading the tests, so might be worth to add

D7631: absorb: allowing committed changes to be absorbed into their ancestors

rdamazio updated this revision to Diff 18728. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D7631?vs=18726=18728 BRANCH default CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7631/new/ REVISION DETAIL

D7631: absorb: allowing committed changes to be absorbed into their ancestors

rdamazio retitled this revision from "RFC: absorb: allowing committed changes to be absorbed into their ancestors" to "absorb: allowing committed changes to be absorbed into their ancestors". rdamazio updated this revision to Diff 18726. REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE

D7631: absorb: allowing committed changes to be absorbed into their ancestors

rdamazio added a comment. In 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.