On Mon, Jun 16, 2008 at 08:35:26 +0200, Johannes Winkelmann wrote: [...]
In other words, there won't be an automatic way to merge changes, however in most situations updates should be straight forward anyway, and for the rest I'd suggest to write a script which fetches the primary port, and runs some merge tool. I've quickly put together a script that fetches a port from another arch, and runs diff: http://jw.smts.ch/files/crux/get_port Adding hooks similar to rejmerge (merge/keep/overwrite) would be fairly easy.
Will of course not work for 'x86_64' for now, since there's git repo (and thus no rsyncable directory) available. Regards, Johannes -- Johannes Winkelmann mailto:jw@smts.ch Zurich, Switzerland http://jw.smts.ch