Date: Tue, 22 Jan 2013 10:21:27 -0600 From: "Joseph A. Nagy, Jr" <jnagyjr1978@gmail.com> To: Oliver Lehmann <lehmann@ans-netz.de> Cc: ports@freebsd.org, Guido Falsi <mad@madpilot.net> Subject: Re: portsnap - overwrite local changes Message-ID: <50FEBC87.2090605@gmail.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 01/22/13 09:59, 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 :( Perhaps merge is the wrong term (but its what svn uses) but what it really does is overwrite the local file with the one from the repo. I've been doing that for months now with no problems. -- Yours in Christ, Joseph A Nagy Jr "Whoever loves instruction loves knowledge, But he who hates correction is stupid." -- Proverbs 12:1 Emails are not formal business letters, whatever businesses may want. Original content CopyFree (F) under the OWL http://owl.apotheon.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?50FEBC87.2090605>