On Dec 27, 2012, at 8:37 AM, Sergey Matveychuk <s...@freebsd.org> wrote:
> 27.12.2012 20:29, Sam Fourman Jr. wrote: >> On Thu, Dec 27, 2012 at 4:18 AM, Wojciech Puchar >> <woj...@wojtek.tensor.gdynia.pl> wrote: >>> but i can't find "moron guide" for using svn to update tree. >> >> 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 >> >> 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 > > svn revert -R /usr/ports - works for me. If you're checking out to a directory that already exists, svn resolved is the way to handle that. There might be (-> probably is) a way to check out the metadata by itself, but I can't verify how right now. Hth, -Garrett _______________________________________________ freebsd-hackers@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-hackers To unsubscribe, send any mail to "freebsd-hackers-unsubscr...@freebsd.org"
