Comment 7 for bug 721211

Quote:
  I do this merge with "bzr merge", no conflict. And the resulting Changelog file is identical to what is in <email address hidden>, which shows that that revision did no edits on what the merge algorithm had produced. So I believe that that revision has changed nothing by itself, so don't see why it is listed by "bzr touching-revisions", and don't see why I got a content conflict in the first merge at the beginning of this bug report.

The merge produced a unique text. This text did not exist in either parent. It wasn't a conflict, and probably a human did not edit the file, but it still represents a unique text in the history of the ChangeLog file. Hence it is marked as "touched". And that shows up as "this file was modified by a revision, that is a child of the version in your ancestry in which you deleted the file."

Note that if I look at the 5.1 branch, I continue to see modification to the ChangeLog file, and I can see those revisions have been merged by the 5.5 branch. So I think this sort of conflict is going to continue to exist. I do believe we have a separate bug for "if a file is deleted in THIS, don't bother treating updates from OTHER as a conflict." Shall we set this as a duplicate of that?