If both repositories write the same keywords on every commit this problem will keep coming up. Perhaps you can make your local repo only write $Rev: $ tags, and the other $Id: $ tags, or something like that?