Merge "return -1 iff any file is updated"