Date: Tue, 22 Jan 2013 17:13:15 +0100 From: Guido Falsi <mad@madpilot.net> To: Oliver Lehmann <lehmann@ans-netz.de> Cc: ports@freebsd.org, "Joseph A. Nagy, Jr" <jnagyjr1978@gmail.com> Subject: Re: portsnap - overwrite local changes Message-ID: <50FEBA9B.3060609@madpilot.net> 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 16: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 :( As I said, svn revert -R . does remove local changes to tracked files. It will ignore added files it does not know about. -- Guido Falsi <mad@madpilot.net>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?50FEBA9B.3060609>