Date: Tue, 22 Jan 2013 16:59:56 +0100 From: Oliver Lehmann <lehmann@ans-netz.de> To: "Joseph A. Nagy, Jr" <jnagyjr1978@gmail.com> Cc: ports@freebsd.org, Guido Falsi <mad@madpilot.net> Subject: Re: portsnap - overwrite local changes Message-ID: <20130122165956.Horde.HiRFvHGe8IdotiCSELKNWg1@avocado.salatschuessel.net> In-Reply-To: <50FEA5B8.9020109@gmail.com> References: <20130122131026.Horde.7qCMctAArqe-64q8vD2RTA1@avocado.salatschuessel.net> <50FE859B.7010607@madpilot.net> <20130122140038.Horde.8nr2dFTy5nEGcYtN8VWTjA6@avocado.salatschuessel.net> <50FEA5B8.9020109@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
"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 :(
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20130122165956.Horde.HiRFvHGe8IdotiCSELKNWg1>