[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [MirageOS-devel] xen-arm-builder restored

>>> Thomas: we need to stream these cron logs to Irmin to make them easier to 
>>> aggregate :-)
>> works in progress is here: https://github.com/samoht/dog
> How about using the existing gitattributes(5) syntax for specifying
> per-file merge strategies?
> https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html#_performing_a_three_way_merge
> (is your "set" the same as Git's "union"?)

Thanks for the link, didn't know about this! The .merge file in dog is very 
similar indeed (although that's not strictly speaking part of the tool, I just 
wanted to be sure that such a thing was easy to do in Irmin). The other part of 
the tool is push/pull/branch logic using the Irmin API. Again, you could do 
this using shell scripts calling the git command-line but that doesn't really 

MirageOS-devel mailing list



Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.