comparison mercurial/progress.py @ 25894:54f9561088c7 stable

histedit: backout ebb5bb9bc32e The faulty changeset use obsolescence marker to roll the repository back on --abort. This is a problematic approach because --abort should be as close as an actually transaction rollback as possible stripping all created data from the repository (cf `hg rebase --abort` stripping all created changesets). Instead ebb5bb9bc32e made all content created during the aborted histedit still available in the repository adding obsolescence marker to make them hidden. This will cause trouble to evolution user as a re-run of the same histedit (with success) will likely result in the very same node to be "recreated" while obsolescence marker would be in place for them. And canceling an obsoletion is still a fairly complicated process. This also rollback using obsmarkers instead of strip to clean up temporary node on successful histedit run because the two change were not split in separated changeset. Rolling that part back does not have significant consequence a will have to be resubmitted independently
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 31 Jul 2015 15:11:07 -0700
parents 56674fd6dabc
children 1139d7cf9405
comparison
equal deleted inserted replaced
25889:79f0cb97d753 25894:54f9561088c7