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 COMMENTS > rdamazio wrote in absorb.py:993 > See the child commit (D7630 <https://phab.mercurial-scm.org/D7630>), which > adds the "evolve" operation. > > Because of the invariant about parent phases, checking that the revision > being absorbed is not public also ensures that everything it's absorbing into > is not public. Is that what you were looking for? If the commit A being > absorbed is a draft and its parent is public, then absorb just won't find > anywhere to absorb the lines and will leave everything in A. > > About setting obsmarkers from the absorbed commit into the targets, while > that's technically correct, I suspect it'll become a hard-to-navigate mess > which adds very little. Do you want me to add that? I think we should at least have a TODO about adding them. By the way, without the next patch's auto-evolve feature, I'm not sure we should add such markers. I think they would trick `hg evolve` into moving any descendant commits onto the topmost commit that was absorbed into, but that's probably not what the user wants (they probably want child commits to be moved onto the absorbed commit's parent). > 5.3:4-7 > + * The `absorb` extension can now absorb existing changesets, in addition to > + the working directory changes, which continues to be the default unless > + `--source`/`-s` is specified. > please revert (sorry about this annoying effect of copy detection) REPOSITORY rHG Mercurial CHANGES SINCE LAST ACTION https://phab.mercurial-scm.org/D7631/new/ REVISION DETAIL https://phab.mercurial-scm.org/D7631 To: rdamazio, #hg-reviewers, martinvonz Cc: mharbison72, martinvonz, pulkit, quark, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
