diff mercurial/match.py @ 25910:b4a85ddadcb9

histedit: do not stay on a cleaned nodes on abort There is case where nodes are neither in tmpnodes nor leaf but still get removed. For example, if you used the "edit" action, made a commit and run --abort. The commit you made is not tracked by histedit, yet it will likely be cleaned up with its parent. The commit may not tracked because no replacements computations are done in the --abort case.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 03 Aug 2015 06:13:05 -0700
parents 511e1949d557
children c4ccf2d394a7 9ac4e81b9659
line wrap: on
line diff