equal
deleted
inserted
replaced
716 self.ui.note(f + "\n") |
716 self.ui.note(f + "\n") |
717 try: |
717 try: |
718 new[f] = self.filecommit(f, m1, m2, linkrev, tr, changed) |
718 new[f] = self.filecommit(f, m1, m2, linkrev, tr, changed) |
719 new_exec = is_exec(f) |
719 new_exec = is_exec(f) |
720 new_link = is_link(f) |
720 new_link = is_link(f) |
721 if not changed or changed[-1] != f: |
721 if (not changed or changed[-1] != f) and m2.get(f) != new[f]: |
722 # mention the file in the changelog if some flag changed, |
722 # mention the file in the changelog if some flag changed, |
723 # even if there was no content change. |
723 # even if there was no content change. |
724 old_exec = m1.execf(f) |
724 old_exec = m1.execf(f) |
725 old_link = m1.linkf(f) |
725 old_link = m1.linkf(f) |
726 if old_exec != new_exec or old_link != new_link: |
726 if old_exec != new_exec or old_link != new_link: |