Using histedit's fixup command on a few commits fails with merge conflicts when there should be none as I tried to squash commits without reordering them. The merge conflicts shows that histedit tried to merge (usually) the very first and the very last commits of the series I was histedit-ing. I have a backup of my repository and a commands file that reproduce the issue on my system. I'll try to find a way to post the tarball somewhere public. FWIW, I'm using evolve.
I can reproduce the issue here: Rémi's tarbal available here http://hg-dev.octopoid.net/tmp/histedit-cubicweb.tar.xz
Tested again today with hg 2.5.4+147-7d31f2e42a8a.
This is a rules parsing issue. with using the short form of 'f the target revision is the empty string ''
Fixed by http://selenic.com/repo/hg/rev/41669a18a7d6 Pierre-Yves David <pierre-yves.david@logilab.fr> histedit: handle multiple spaces between action and hash (issue3893) There is some clue that the previous code intended to handle that but it was actually not the case. As a result action could apply to the empty string '' changeset, leading to the use the current working directory parent in some operations. (please test the fix)
Fixed by https://selenic.com/repo/hg/rev/5b68f72c2ba9 timeless <timeless@mozdev.org> tests: relax histedit issue4251 and issue3893 backups I'm globbing these because some are globbed, and this pair gets in the way of the main parts of the series. (please test the fix)
Bug was set to TESTING for 7 days, resolving