Date: Tue, 22 Jan 2013 17:27:18 +0100 From: Guido Falsi <mad@madpilot.net> To: "Joseph A. Nagy, Jr" <jnagyjr1978@gmail.com> Cc: ports@freebsd.org, Oliver Lehmann <lehmann@ans-netz.de> Subject: Re: portsnap - overwrite local changes Message-ID: <50FEBDE6.2020107@madpilot.net> In-Reply-To: <50FEBC87.2090605@gmail.com> 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> <50FEBC87.2090605@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On 01/22/13 17:21, Joseph A. Nagy, Jr wrote: > 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. > No, this is not correct. It depends on the kind of conflict. If you have not conflicting changes in your local copy those will be merged. There will be a G letter besides those files in the "svn up" output. No error message. If the change is conflicting it will ask you what to do. If the file has no change in the repo but has local changes local changes will survive. If you instead always use "svn checkout" then yes, it will overwrite changes. If subversion did such a thing(destroying local changes silently) it would be a very big problem for developers. -- Guido Falsi <mad@madpilot.net>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?50FEBDE6.2020107>