Merging file remove into local appears incorrectly in changelog
Created originally on Bitbucket by josschne (Joe Schneider)
Version: Using thg 2.0.3 / hg 1.8.2, also tested on tip build version 2.0.3+153-e1ed86384cce
Summary: My understanding is that the default changelog view only shows files that were modified in both parents of a merge. In the case where only one of the parents removes a file and the other parent has no changes to that file, the removed file appears in the default changelog view incorrectly.
To reproduce: {{{ hg init test_repo cd test_repo echo test > a.txt hg addremove hg ci -m "Add a" hg remove a.txt hg ci -m "Remove a" hg up -r 0 echo test > b.txt hg addremove hg ci -m "Add b" hg merge -r 1 hg ci -m "Merge" }}} Open the resulting repository in thg and view the default changelog for the merge changeset (rev 3). "a.txt" will be shown in the default view incorrectly. Clicking the "Show All" button shows that thg believe the file was changed from both parents, which is incorrect.
Note that doing the merge in the opposite direction appears to work correctly.