Date: Fri, 11 Jan 2013 19:20:56 -0700 (MST) From: Warren Block <wblock@wonkity.com> To: "Brian W." <brian@brianwhalen.net> Cc: "freebsd-stable@freebsd.org" <freebsd-stable@freebsd.org> Subject: Re: csup to svn for 8-stable Message-ID: <alpine.BSF.2.00.1301111919270.1098@wonkity.com> In-Reply-To: <CADV=szWMqSKurCnGS8kEqPAXnmyPcDyxW4FHQYc=qQ7C6Oz1Ag@mail.gmail.com> References: <CADV=szVSKnD7kPSY19zfhYP_hJ02vm7C-d7NDcCq9FwH-BjD%2Bg@mail.gmail.com> <20130111224828.GL2001@albert.catwhisker.org> <CADV=szWMqSKurCnGS8kEqPAXnmyPcDyxW4FHQYc=qQ7C6Oz1Ag@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 11 Jan 2013, Brian W. wrote: > When I tried the first time, it only grabbed a few folders, a second try > got me a conflict message. I then just whacked /usr/src and did the svn co > again, successfully. An important difference is that if you modify a file in /usr/src, an svn update will not overwrite it but try to merge with new versions of the file from the repository.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?alpine.BSF.2.00.1301111919270.1098>