Date: Tue, 22 Jan 2013 16:37:36 +0000 From: RW <rwmaillists@googlemail.com> To: ports@freebsd.org Subject: Re: portsnap - overwrite local changes Message-ID: <20130122163736.590e79da@gumby.homeunix.com> In-Reply-To: <20130122165956.Horde.HiRFvHGe8IdotiCSELKNWg1@avocado.salatschuessel.net> References: <20130122131026.Horde.7qCMctAArqe-64q8vD2RTA1@avocado.salatschuessel.net> <50FE859B.7010607@madpilot.net> <20130122140038.Horde.8nr2dFTy5nEGcYtN8VWTjA6@avocado.salatschuessel.net> <50FEA5B8.9020109@gmail.com> <20130122165956.Horde.HiRFvHGe8IdotiCSELKNWg1@avocado.salatschuessel.net>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 22 Jan 2013 16:59:56 +0100 Oliver Lehmann wrote: > > "Joseph A. Nagy, Jr" <jnagyjr1978@gmail.com> wrote: > > I know when I run it manually and there is a conflict, it will > > tell me about a merge-conflict and ask me which file to keep (mine > > or theirs), selecting theirs, afaik, overwrites my local file. > > And when there is no conflict and it can be merged, you have a merged > file. And in some point in time your local /usr/ports is messed up > with forgotten local changes and so on... I just wanna make sure to > automatically "clean up" my /usr/ports. CVSup did this :( Not necessarily correctly. That reverts any modifications, but it wont necessarily remove files that need to be removed and which may cause problems if left in place. This is why "portsnap extract" removes port directories before writing a clean copy. I presume you could extract a single port if you can't spare the time for a full extract.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130122163736.590e79da>