Date: Thu, 27 Dec 2012 09:22:24 -0800 From: Garrett Cooper <yanegomi@gmail.com> To: Sergey Matveychuk <sem@FreeBSD.org> Cc: "Sam Fourman Jr." <sfourman@gmail.com>, Wojciech Puchar <wojtek@wojtek.tensor.gdynia.pl>, "freebsd-hackers@freebsd.org" <freebsd-hackers@freebsd.org> Subject: Re: cvs deprecated Message-ID: <74CCA452-07DD-4E17-9E0E-66EBAF9B0470@gmail.com> In-Reply-To: <50DC7958.70305@FreeBSD.org> References: <alpine.BSF.2.00.1212271016340.35118@wojtek.tensor.gdynia.pl> <CAOFF%2BZ0qxL2heuheHNJFTKHsV8PWMs4ih63hMg7jYb=zcOk-5w@mail.gmail.com> <50DC7958.70305@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Dec 27, 2012, at 8:37 AM, Sergey Matveychuk <sem@FreeBSD.org> wrote: > 27.12.2012 20:29, Sam Fourman Jr. wrote: >> On Thu, Dec 27, 2012 at 4:18 AM, Wojciech Puchar >> <wojtek@wojtek.tensor.gdynia.pl> wrote: >>> but i can't find "moron guide" for using svn to update tree. >>=20 >> I cant seem to find a way to handle conflicts, ive tried to do svn >> revert on every directory, but there is always more... maybe svn just >> isnt a good way to keep your ports tree current >>=20 >> svn up >> Updating '.': >> Skipped 'databases' -- Node remains in conflict >> Skipped 'irc' -- Node remains in conflict >> Skipped 'lang' -- Node remains in conflict >> Skipped 'security/cyrus-sasl2' -- Node remains in conflict >> Skipped 'x11/keybinder' -- Node remains in conflict >> Skipped 'net-mgmt' -- Node remains in conflict >> At revision 309546. >> Summary of conflicts: >> Skipped paths: 6 >=20 > svn revert -R /usr/ports - works for me. If you're checking out to a directory that already exists, svn resolved is t= he way to handle that. There might be (-> probably is) a way to check out th= e metadata by itself, but I can't verify how right now. Hth, -Garrett=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?74CCA452-07DD-4E17-9E0E-66EBAF9B0470>