{"id":1469,"date":"2005-12-23T12:06:37","date_gmt":"2005-12-23T03:06:37","guid":{"rendered":"http:\/\/www.sssg.org\/blogs\/hiro345\/?p=1469"},"modified":"2005-12-24T12:08:25","modified_gmt":"2005-12-24T03:08:25","slug":"subversion-2","status":"publish","type":"post","link":"https:\/\/www.hiro345.net\/blogs\/hiro345\/archives\/1469.html","title":{"rendered":"Subversion"},"content":{"rendered":"

Subversion\u306e\u30b3\u30de\u30f3\u30c9\u30e1\u30e2\u3002<\/p>\n

\u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u4f5c\u6210<\/b><\/p>\n

\r\n# mkdir \/var\/svn\r\n# svnadmin create \/var\/svn\r\n# chown -R hiro345:hiro345 \/var\/svn\r\n<\/pre>\n
\u30a4\u30f3\u30dd\u30fc\u30c8<\/b><\/p>\n
\r\n$ svn --version\r\n$ echo hello > hello.txt\r\n$ echo Hi > hi.txt\r\n$ svn import -m "Hello project" . file:\/\/\/var\/svn\/kei\/trunk\r\n\u8ffd\u52a0\u3057\u3066\u3044\u307e\u3059              hello.txt\r\n\u8ffd\u52a0\u3057\u3066\u3044\u307e\u3059              hi.txt\r\n\r\n\u30ea\u30d3\u30b8\u30e7\u30f3 1 \u3092\u30b3\u30df\u30c3\u30c8\u3057\u307e\u3057\u305f\u3002\r\n<\/pre>\n
\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8<\/b><\/p>\n
\r\n$ mkdir ..\/work\r\n$ cd ..\/work\r\n$ svn co file:\/\/\/var\/svn\/kei\/trunk kei\r\nA    kei\/hello.txt\r\nA    kei\/hi.txt\r\n\u30ea\u30d3\u30b8\u30e7\u30f3 1 \u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u307e\u3057\u305f\u3002\r\n<\/pre>\n
\u7de8\u96c6\u3068\u5dee\u5206\u306e\u78ba\u8a8d<\/b><\/p>\n
\r\n$ cd kei\r\n$ echo "Hello, Micky" >> hello.txt\r\n$ svn status hello.txt\r\nM      hello.txt\r\n$ svn diff hello.txt\r\nIndex: hello.txt\r\n===================================================================\r\n--- hello.txt   (\u30ea\u30d3\u30b8\u30e7\u30f3 1)\r\n+++ hello.txt   (\u4f5c\u696d\u30b3\u30d4\u30fc)\r\n@@ -1 +1,2 @@\r\n hello\r\n+Hello, Micky\r\n<\/pre>\n
\u30b3\u30df\u30c3\u30c8\u3068\u30ed\u30b0\u306e\u78ba\u8a8d<\/b><\/p>\n
\r\n$ svn commit -m "Added Hello, Micky"\r\n\u9001\u4fe1\u3057\u3066\u3044\u307e\u3059              hello.txt\r\n\u30d5\u30a1\u30a4\u30eb\u306e\u30c7\u30fc\u30bf\u3092\u9001\u4fe1\u4e2d\u3067\u3059.\r\n\u30ea\u30d3\u30b8\u30e7\u30f3 2 \u3092\u30b3\u30df\u30c3\u30c8\u3057\u307e\u3057\u305f\u3002\r\n\r\n$ LANG=C svn log hello.txt\r\n------------------------------------------------------------------------\r\nr2 | hiro345 | 2005-12-15 20:06:55 +0900 (Thu, 15 Dec 2005) | 1 line\r\n\r\nAdded Hello, Micky\r\n------------------------------------------------------------------------\r\nr1 | hiro345 | 2005-12-15 19:56:43 +0900 (Thu, 15 Dec 2005) | 1 line\r\n\r\nHello project\r\n------------------------------------------------------------------------\r\n\r\n\r\n$ LANG=C svn log --verbose hello.txt\r\n------------------------------------------------------------------------\r\nr2 | hiro345 | 2005-12-15 20:06:55 +0900 (Thu, 15 Dec 2005) | 1 line\r\nChanged paths:\r\n   M \/kei\/trunk\/hello.txt\r\n\r\nAdded Hello, Micky\r\n------------------------------------------------------------------------\r\nr1 | hiro345 | 2005-12-15 19:56:43 +0900 (Thu, 15 Dec 2005) | 1 line\r\nChanged paths:\r\n   A \/kei\r\n   A \/kei\/trunk\r\n   A \/kei\/trunk\/hello.txt\r\n   A \/kei\/trunk\/hi.txt\r\n\r\nHello project\r\n------------------------------------------------------------------------\r\n<\/pre>\n
\u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u3078\u306e\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8<\/b><\/p>\n
\r\n$ cd ..\r\n$ svn co file:\/\/\/var\/svn\/kei\/trunk shu\r\nA    shu\/hello.txt\r\nA    shu\/hi.txt\r\n\u30ea\u30d3\u30b8\u30e7\u30f3 2 \u3092\u30c1\u30a7\u30c3\u30af\u30a2\u30a6\u30c8\u3057\u307e\u3057\u305f\u3002\r\n$ cd kei\/\r\n$ echo "Hi, Micky" >> hi.txt\r\n$ svn commit -m "Added Hi, Micky"\r\n\u9001\u4fe1\u3057\u3066\u3044\u307e\u3059              hi.txt\r\n\u30d5\u30a1\u30a4\u30eb\u306e\u30c7\u30fc\u30bf\u3092\u9001\u4fe1\u4e2d\u3067\u3059.\r\n\u30ea\u30d3\u30b8\u30e7\u30f3 3 \u3092\u30b3\u30df\u30c3\u30c8\u3057\u307e\u3057\u305f\u3002\r\n$ cd ..\/shu\r\n$ svn status --show-updates\r\n       *        2   hi.txt\r\n\u72b6\u614b\u306e\u80cc\u666f\u3068\u306a\u308b\u30ea\u30d3\u30b8\u30e7\u30f3:      3\r\n$ svn diff -rHEAD hi.txt\r\nIndex: hi.txt\r\n===================================================================\r\n--- hi.txt      (\u30ea\u30d3\u30b8\u30e7\u30f3 3)\r\n+++ hi.txt      (\u4f5c\u696d\u30b3\u30d4\u30fc)\r\n@@ -1,2 +1 @@\r\n Hi\r\n-Hi, Micky\r\n$ svn update\r\nU    hi.txt\r\n\u30ea\u30d3\u30b8\u30e7\u30f3 3 \u306b\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002\r\n<\/pre>\n
\u7af6\u5408<\/b><\/p>\n
\r\n$ echo "Hi, Minny" >> hi.txt\r\n$ svn commit -m "Added Hi, Minny"\r\n\u9001\u4fe1\u3057\u3066\u3044\u307e\u3059              hi.txt\r\n\u30d5\u30a1\u30a4\u30eb\u306e\u30c7\u30fc\u30bf\u3092\u9001\u4fe1\u4e2d\u3067\u3059.\r\n\u30ea\u30d3\u30b8\u30e7\u30f3 4 \u3092\u30b3\u30df\u30c3\u30c8\u3057\u307e\u3057\u305f\u3002\r\n\r\n$ cd ..\/kei\r\n$ echo "Hi, Pluto" >> hi.txt\r\n$ svn commit -m "Added Hi, Pluto"\r\n\u9001\u4fe1\u3057\u3066\u3044\u307e\u3059              hi.txt\r\nsvn: \u30b3\u30df\u30c3\u30c8\u306b\u5931\u6557\u3057\u307e\u3057\u305f (\u8a73\u3057\u3044\u7406\u7531\u306f\u4ee5\u4e0b\u306e\u3068\u304a\u308a\u3067\u3059):\r\nsvn: '\/kei\/trunk\/hi.txt' (\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3 '4-1' \u4e2d) \u306f\u30ea\u30dd\u30b8\u30c8\u30ea\u5074\u3068\u6bd4\u3079\u3066\u53e4\u304f \u306a\u3063\u3066\u3044\u307e\u3059\r\n$ svn update\r\nC    hi.txt\r\n\u30ea\u30d3\u30b8\u30e7\u30f3 4 \u306b\u66f4\u65b0\u3057\u307e\u3057\u305f\u3002\r\n$ cat hi.txt\r\nHi\r\nHi, Micky\r\n<<<<<<< .mine\r\nHi, Pluto\r\n=======\r\nHi, Minny\r\n>>>>>>> .r4\r\n<\/pre>\n
<<<<<<< .mine\u3068>>>>>>> .r4\u306b\u56f2\u307e\u308c\u305f\u3068\u3053\u308d\u304c\u7af6\u5408\u3057\u3066\u3044\u308b\u306e\u3067\u3001\u7de8\u96c6\u3057\u3066\u30de\u30fc\u30b8\u3057\u307e\u3059\u3002<\/p>\n
\r\n$ vi hi.txt\r\n$ cat hi.txt\r\nHi\r\nHi, Micky\r\nHi, Minny\r\nHi, Pluto\r\n<\/pre>\n
\u885d\u7a81\u72b6\u614b\u3092\u89e3\u6d88\u3057\u3066\u304b\u3089\u30b3\u30df\u30c3\u30c8\u3057\u307e\u3059\u3002<\/p>\n
\r\n$ svn resolved hi.txt\r\n'hi.txt' \u306e\u885d\u7a81\u72b6\u614b\u3092\u89e3\u6d88\u3057\u307e\u3057\u305f\r\n$ svn commit -m "Added Hi, Pluto"\r\n\u9001\u4fe1\u3057\u3066\u3044\u307e\u3059              hi.txt\r\n\u30d5\u30a1\u30a4\u30eb\u306e\u30c7\u30fc\u30bf\u3092\u9001\u4fe1\u4e2d\u3067\u3059.\r\n\u30ea\u30d3\u30b8\u30e7\u30f3 5 \u3092\u30b3\u30df\u30c3\u30c8\u3057\u307e\u3057\u305f\u3002\r\n<\/pre>\n
\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30d7\u30ed\u30c8\u30b3\u30eb<\/b><\/p>\n
\r\n$ svn co svn:\/\/five.sssg.org\/var\/svn\/kei\/trunk kei\r\n$ svn co svn+ssh:\/\/five.sssg.org\/var\/svn\/kei\/trunk el\r\n$ svn co http:\/\/five.sssg.org\/svn\/kei\/trunk em\r\n<\/pre>\n","protected":false},"excerpt":{"rendered":"
Subversion\u306e\u30b3\u30de\u30f3\u30c9\u30e1\u30e2\u3002 \u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u4f5c\u6210 # mkdir \/var\/svn # svnadmin create \/var\/svn # chown -R hiro345:hiro345 \/var\/svn \u30a4\u30f3 … \u7d9a\u304d\u3092\u8aad\u3080 →<\/span><\/a><\/p>\n","protected":false},"author":2,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[6],"tags":[],"class_list":["post-1469","post","type-post","status-publish","format-standard","hentry","category-linux"],"_links":{"self":[{"href":"https:\/\/www.hiro345.net\/blogs\/hiro345\/wp-json\/wp\/v2\/posts\/1469","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.hiro345.net\/blogs\/hiro345\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.hiro345.net\/blogs\/hiro345\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.hiro345.net\/blogs\/hiro345\/wp-json\/wp\/v2\/users\/2"}],"replies":[{"embeddable":true,"href":"https:\/\/www.hiro345.net\/blogs\/hiro345\/wp-json\/wp\/v2\/comments?post=1469"}],"version-history":[{"count":0,"href":"https:\/\/www.hiro345.net\/blogs\/hiro345\/wp-json\/wp\/v2\/posts\/1469\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.hiro345.net\/blogs\/hiro345\/wp-json\/wp\/v2\/media?parent=1469"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.hiro345.net\/blogs\/hiro345\/wp-json\/wp\/v2\/categories?post=1469"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.hiro345.net\/blogs\/hiro345\/wp-json\/wp\/v2\/tags?post=1469"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}