{"id":1228,"date":"2012-05-03T22:02:06","date_gmt":"2012-05-03T16:02:06","guid":{"rendered":"http:\/\/blog.amigas.ru\/?p=1228"},"modified":"2014-03-17T15:18:35","modified_gmt":"2014-03-17T09:18:35","slug":"obnovlenie-isxodnikov-freebsd-s-pomoshhyu-svn","status":"publish","type":"post","link":"http:\/\/blog.amigas.ru\/?p=1228","title":{"rendered":"\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u0438\u0441\u0445\u043e\u0434\u043d\u0438\u043a\u043e\u0432 FreeBSD \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e svn"},"content":{"rendered":"

\u0421\u043b\u043e\u0432\u0438\u0432 \u043f\u0430\u0440\u0443 «\u0433\u043b\u044e\u043a\u043e\u0432» \u043f\u0440\u0438 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0438 \u0438\u0441\u0445\u043e\u0434\u043d\u0438\u043a\u043e\u0432 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e cvsup, \u044f \u0440\u0435\u0448\u0438\u043b \u043d\u0430\u043a\u043e\u043d\u0435\u0446 \u0442\u043e \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u043d\u0430 svn.
\n\u0414\u043b\u044f \u043d\u0430\u0447\u0430\u043b\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u043c subversion.<\/strong>
\n#cd \/usr\/ports\/devel\/subversion
\n#make install clean
\n\u041f\u043e\u0441\u043b\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438, \u043c\u043e\u0436\u043d\u043e \u043f\u043e\u0447\u0438\u0442\u0430\u0442\u044c \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u043f\u043e svn.
\n#svn help
\n\u0421\u043f\u0435\u0440\u0432\u0430 \u044f \u0440\u0435\u0448\u0438\u043b \u043e\u0447\u0438\u0441\u0442\u0438\u0442\u044c \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \u0438\u0441\u0445\u043e\u0434\u043d\u0438\u043a\u043e\u0432 \u043f\u043e\u0434\u0447\u0438\u0441\u0442\u0443\u044e.....#rm \/usr\/src<\/strong>
\n\u0414\u0430\u043b\u044c\u0448\u0435 \u0432\u0441\u0451 \u0435\u0449\u0451 \u043f\u0440\u043e\u0449\u0435.
\n\u0421\u043a\u0430\u0447\u0438\u0432\u0430\u0435\u043c \u043d\u0443\u0436\u043d\u0443\u044e \u043d\u0430\u043c \u0432\u0435\u0442\u043a\u0443:<\/strong>
\n#svn checkout http:\/\/svn.freebsd.org\/base\/releng\/8.3\/ \/usr\/src - \u0447\u0435\u0440\u0435\u0437 HTTP
\n\u0438\u043b\u0438 \u0442\u0430\u043a:
\n#svn checkout svn:\/\/svn.freebsd.org\/base\/releng\/8.3\/ \/usr\/src - \u0447\u0435\u0440\u0435\u0437 SVN<\/p>\n

\u041e\u0431\u043d\u043e\u0432\u043b\u044f\u0435\u043c \u0442\u0430\u043a:<\/strong>
\n#svn update \/usr\/src\/
\nAt revision 234940<\/p>\n

\u041f\u0440\u043e\u0432\u0435\u0440\u044f\u0435\u043c:<\/strong>
\n#grep -A 2 'TYPE=\"' \/usr\/src\/sys\/conf\/newvers.sh
\nTYPE=\"FreeBSD\"
\nREVISION=\"8.3\"
\nBRANCH=\"RELEASE\"<\/p>\n

\u0412\u044b\u0432\u043e\u0434.<\/strong> \u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 SVN. \u041d\u0430\u043c\u043d\u043e\u0433\u043e \u043f\u0440\u043e\u0449\u0435 \u0438 \u043d\u0430\u0434\u0451\u0436\u043d\u0435\u0435. \u0418 \u043c\u0435\u043d\u044c\u0448\u0435 \u0448\u0430\u043d\u0441\u043e\u0432 \u0441\u043b\u043e\u0432\u0438\u0442\u044c \"\u0433\u043b\u044e\u043a\u0438\".<\/p>\n

UPDATE 04-05-2012<\/strong><\/span>
\n\u0420\u0435\u0448\u0438\u043b \u043f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u044c \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f. \u0418 \u043f\u043e\u043b\u0443\u0447\u0438\u043b \u0442\u0430\u043a\u043e\u0435:
\nkoms# svn update \/usr\/src\/
\nUpdating '\/usr\/src':
\nSkipped '\/usr\/src\/crypto' -- Node remains in conflict
\nSkipped '\/usr\/src\/UPDATING' -- Node remains in conflict
\nSkipped '\/usr\/src\/sys' -- Node remains in conflict
\nAt revision 234994.
\nSummary of conflicts:
\nSkipped paths: 3<\/code>
\n\u0427\u0442\u043e \u0434\u0435\u043b\u0430\u0442\u044c!? \u0410 \u043d\u0438\u0447\u0435\u0433\u043e. \u041f\u0440\u043e\u0441\u0442\u043e \u0436\u0434\u0430\u0442\u044c \u043f\u0430\u0440\u0443 \u0434\u043d\u0435\u0439 \u0438\u043b\u0438 \u0431\u043e\u043b\u044c\u0448\u0435. \u041f\u0440\u043e\u0438\u0441\u0445\u043e\u0434\u0438\u0442 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0435 \u043a\u043e\u0434\u0430 \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435 \u0432 \u044d\u0442\u0438\u0445 \u043f\u0430\u043f\u043a\u0430\u0445. \u0418 \u043a\u0430\u043a \u043a\u043e\u0434 \u0431\u0443\u0434\u0435\u0442 \u043f\u0440\u0438\u043d\u044f\u0442, \u0438\u0441\u0445\u043e\u0434\u043d\u0438\u043a\u0438 \u043e\u0431\u043d\u043e\u0432\u044f\u0442\u0441\u044f \u043d\u043e\u0440\u043c\u0430\u043b\u044c\u043d\u043e, \u0431\u0435\u0437 \u0432\u0441\u044f\u043a\u0438\u0445 \u043f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0436\u0434\u0435\u043d\u0438\u0439.<\/p>\n

p.s. \u041f\u043e\u043c\u043e\u0433\u043b\u043e \u043f\u043e\u043b\u043d\u043e\u0435 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u043a\u0430\u0442\u0430\u043b\u043e\u0433\u0430 src \u0438 \u043f\u043e \u043d\u043e\u0432\u043e\u043c\u0443 \u043f\u043e\u043b\u043d\u043e\u0435 \u0441\u043a\u0430\u0447\u0438\u0432\u0430\u043d\u0438\u0435.<\/p>\n

p.p.s. \u0427\u0443\u0442\u044c \u043f\u043e\u0437\u0436\u0435 \u0434\u043e\u043f\u0438\u0448\u0443 \u0441\u0442\u0430\u0442\u0435\u0439\u043a\u0443 \u043f\u043e \u043f\u043e\u0432\u043e\u0434\u0443 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u0438 \u043a\u043e\u043c\u0430\u043d\u0434\u044b resolved.<\/p>\n","protected":false},"excerpt":{"rendered":"

\u0421\u043b\u043e\u0432\u0438\u0432 \u043f\u0430\u0440\u0443 «\u0433\u043b\u044e\u043a\u043e\u0432» \u043f\u0440\u0438 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0438 \u0438\u0441\u0445\u043e\u0434\u043d\u0438\u043a\u043e\u0432 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e cvsup, \u044f \u0440\u0435\u0448\u0438\u043b \u043d\u0430\u043a\u043e\u043d\u0435\u0446 \u0442\u043e \u043f\u0435\u0440\u0435\u0439\u0442\u0438 \u043d\u0430 svn. \u0414\u043b\u044f \u043d\u0430\u0447\u0430\u043b\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u043c subversion. #cd \/usr\/ports\/devel\/subversion #make install clean \u041f\u043e\u0441\u043b\u0435 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438, \u043c\u043e\u0436\u043d\u043e \u043f\u043e\u0447\u0438\u0442\u0430\u0442\u044c \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u043f\u043e svn. #svn help \u0421\u043f\u0435\u0440\u0432\u0430 \u044f \u0440\u0435\u0448\u0438\u043b \u043e\u0447\u0438\u0441\u0442\u0438\u0442\u044c \u043a\u0430\u0442\u0430\u043b\u043e\u0433 \u0438\u0441\u0445\u043e\u0434\u043d\u0438\u043a\u043e\u0432 \u043f\u043e\u0434\u0447\u0438\u0441\u0442\u0443\u044e…..#rm \/usr\/src \u0414\u0430\u043b\u044c\u0448\u0435 \u0432\u0441\u0451 \u0435\u0449\u0451 \u043f\u0440\u043e\u0449\u0435. \u0421\u043a\u0430\u0447\u0438\u0432\u0430\u0435\u043c \u043d\u0443\u0436\u043d\u0443\u044e \u043d\u0430\u043c \u0432\u0435\u0442\u043a\u0443: #svn checkout http:\/\/svn.freebsd.org\/base\/releng\/8.3\/ \/usr\/src — […]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"ngg_post_thumbnail":0,"footnotes":""},"categories":[101],"tags":[149,102],"class_list":["post-1228","post","type-post","status-publish","format-standard","hentry","category-update","tag-freebsd","tag-update-2"],"views":2883,"_links":{"self":[{"href":"http:\/\/blog.amigas.ru\/index.php?rest_route=\/wp\/v2\/posts\/1228","targetHints":{"allow":["GET"]}}],"collection":[{"href":"http:\/\/blog.amigas.ru\/index.php?rest_route=\/wp\/v2\/posts"}],"about":[{"href":"http:\/\/blog.amigas.ru\/index.php?rest_route=\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"http:\/\/blog.amigas.ru\/index.php?rest_route=\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"http:\/\/blog.amigas.ru\/index.php?rest_route=%2Fwp%2Fv2%2Fcomments&post=1228"}],"version-history":[{"count":6,"href":"http:\/\/blog.amigas.ru\/index.php?rest_route=\/wp\/v2\/posts\/1228\/revisions"}],"predecessor-version":[{"id":2040,"href":"http:\/\/blog.amigas.ru\/index.php?rest_route=\/wp\/v2\/posts\/1228\/revisions\/2040"}],"wp:attachment":[{"href":"http:\/\/blog.amigas.ru\/index.php?rest_route=%2Fwp%2Fv2%2Fmedia&parent=1228"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"http:\/\/blog.amigas.ru\/index.php?rest_route=%2Fwp%2Fv2%2Fcategories&post=1228"},{"taxonomy":"post_tag","embeddable":true,"href":"http:\/\/blog.amigas.ru\/index.php?rest_route=%2Fwp%2Fv2%2Ftags&post=1228"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}