Re: [Gnu-arch-users] Conflicts in .arch-ids

[Catalin Marinas]

On Tue, 2004-08-10 at 13:59, Aaron Bentley wrote:
> Or else, when you apply the kernel patch that adds your file, copy the 
> .id file from your cm working tree into the mainline tree.  Perhaps 
> tla-update-ids should support doing that automatically.

It is pretty simple to add support for this to tla-update-ids. I will
try to do it and provide a patch.

> In order for people using Arch to collaborate, there must be ID parity. 
>   So I'd strongly encourage you to publish and publicise your Arch 
> version of the Linux mainline, so that other Archers use that set of IDs 
> instead of making their own.

But other people might have the same way of developing as mine - adding
files in their own archive before they are released in the main kernel.
When the new ids are available in my mainline archive, it is too late
for them since they already created the id in their own archives.

This would work very well if everybody uses arch and there is no need
for tla-update-ids but only "tla replay" (i.e. replace bitkeeper with
arch :-) ).

Another possibility would be to create the id based on the SHA1 or MD5
signature of the file. If people would apply the same patch to their own
trees, the id should be the same. Problems still remain if people apply
different versions of the patch.

Catalin