comparison tests/test-clone-r.t @ 17242:336121088ef1 stable

histedit: fix new nodes computation with --continue (issue3534) When running the following actions: pick 617f94f13c0f 1 +4 drop 888f9082bf99 2 +5 fold 251d831eeec5 3 +6 if the fold fails, is fixed by the user with a new changeset, --continue will ignore the new revision when generating the fold changelog. This was caused by --continue detecting new changesets as descendants of the parent not descendants of changesets in the initial list. In this case, dropped changesets must be ignored. Even with the computation fixed, the 'newchildren' list was always emptied by the filtering loop and passed empty to finishfold(). Note that changesets dropped and recreated identically will still be missed. This probably cannot be solved but is unlikely to happen. Other things, like 'newchildren' having multiple heads, should be checked as well.
author Patrick Mezard <patrick@mezard.eu>
date Wed, 25 Jul 2012 16:27:26 +0200
parents b87acfda5268
children 30be3aeb5344
comparison
equal deleted inserted replaced
17241:c2f13180001f 17242:336121088ef1