Johannes Winkelmann [2008-06-16 09:44]:
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.
I've set up {core,opt,xorg}-x86_64.git today. So opt.rsync looks like this eg: host=crux.nu collection=ports/crux-2.4/opt-x86_64/ destination=/usr/ports/opt ... so just append "-x86_64" to the URLs ;) The repos are still pretty empty, but will probably be populated soonish :D Regards, Tilman -- A: Because it messes up the order in which people normally read text. Q: Why is top-posting such a bad thing? A: Top-posting. Q: What is the most annoying thing on usenet and in e-mail?