Comment 5 for bug 351317

Revision history for this message
Sergei Golubchik (sergii) wrote : Re: file ids are not very unique

I've got this issue too, trying to merge repositories and getting conflicts on COPYING, README, etc.

My solution was to append the revision id where the file was first seen (that is, the revision that has added the file). It's unique, and one can branch, uncommit, pull, fork git repositories, etc — and the file id will [supposedly] stay the same. Furthermore, it's probably even safe for roundtripping.

Here's a patch that implements it. I've only tested branch, uncommit, and pull, it quite possibly incomplete and will break other use cases.