Date: Tue, 22 Jan 2013 13:27:07 +0100 From: Guido Falsi <mad@madpilot.net> To: Oliver Lehmann <lehmann@ans-netz.de> Cc: ports@freebsd.org Subject: Re: portsnap - overwrite local changes Message-ID: <50FE859B.7010607@madpilot.net> In-Reply-To: <20130122131026.Horde.7qCMctAArqe-64q8vD2RTA1@avocado.salatschuessel.net> References: <20130122131026.Horde.7qCMctAArqe-64q8vD2RTA1@avocado.salatschuessel.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On 01/22/13 13:10, Oliver Lehmann wrote: > Hi, > > in case I made some local modifications to a ports Makefile.... in the > past with CVSup it was "easy" to get everything back in-sync by just > running CVSup. With portsnap fetch update, my modified Makefile stays > modified. What is the suggested way in syncing my local portstree 1:1 > with the official portstree? > If you use small modifications on a ingle system(or just a few) you could track the ports tree with subversion, which will be happy to keep and try to merge your local modifcations. You can also diff and revert your modifications using it, which can be quite handy. Disvantage is you will sometime need to merge conflicts which could require you to study subversion more than what you really want. If instead you have modifications to your ports tree you want to merge to more than just a few machines(more than two, is already enough) I suggest you investigate ports-mgmt/portshaker. It allows you to overlay the ports tree with your modifications. You can track your modifications using some VCS (subversion, or git if you lke it more for example) and just make the various machines pull the official tree, your modifications and merge them. It does require that you keep your local modifications up to date anyway though. Hope this helps. -- Guido Falsi <mad@madpilot.net>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?50FE859B.7010607>