{"id":304,"date":"2013-05-03T15:13:49","date_gmt":"2013-05-03T15:13:49","guid":{"rendered":"37bc2f75bf1bcfe8450a1a41c200364c"},"modified":"2013-05-03T15:13:49","modified_gmt":"2013-05-03T15:13:49","slug":"","status":"publish","type":"post","link":"https:\/\/www.xiaobo.li\/notes\/archives\/304","title":{"rendered":"SVN \u51b2\u7a81 \u6811\u51b2\u7a81"},"content":{"rendered":"

\u7ecf\u5e38\u6709\u4eba\u4f1a\u8bf4\uff0c\u6811\u51b2\u7a81\u662f\u5f88\u96be\u89e3\u51b3\u7684\u4e00\u7c7b\u51b2\u7a81\uff0c\u5176\u5b9e\u4e00\u65e6\u4e86\u89e3\u4e86\u5176\u539f\u7406\uff0c\u8981\u89e3\u51b3\u4e5f\u4e0d\u96be\u3002\u5148\u56de\u987e\u4e0b\u5bf9\u4e8e\u6811\u51b2\u7a81\u7684\u5b9a\u4e49\u3002 <\/p>\n

    \u6811\u51b2\u7a81\uff1a<\/span><\/b>\u5f53\u4e00\u540d\u5f00\u53d1\u4eba\u5458\u79fb\u52a8\u3001\u91cd\u547d\u540d\u3001\u5220\u9664\u4e00\u4e2a\u6587\u4ef6\u6216\u6587\u4ef6\u5939\uff0c\u800c\u53e6\u4e00\u540d\u5f00\u53d1\u4eba\u5458\u4e5f\u5bf9\u5b83\u4eec\u8fdb\u884c\u4e86\u79fb\u52a8\u3001\u91cd\u547d\u540d\u3001\u5220\u9664\u6216\u8005\u4ec5\u4ec5\u662f\u4fee\u6539\u65f6\u5c31\u4f1a\u53d1\u751f\u6811\u51b2\u7a81\u3002<\/span><\/div>\n
\u51fa\u73b0\u51b2\u7a81\u65f6\uff0c\u4e00\u822c\u4f1a\u63d0\u793a\u51b2\u7a81\u7684\u4fe1\u606f\u662f\u4ec0\u4e48\u3002\u8fc7\u540e\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528svn st\u6765\u67e5\u770b\u5f53\u524d\u72b6\u6001\u3002svn st\u7684\u5404\u79cd\u72b6\u6001\u4ee3\u8868\u4ec0\u4e48\uff0c\u8bf7\u53c2\u8003\u6b64\u535a\u6587<\/span>svn st\u72b6\u6001\u8be6\u89e3<\/span><\/a>\u3002<\/span><\/div>\n
\u5148\u4ecb\u7ecd\u4e00\u4e0b\u6982\u5ff5<\/span><\/div>\n
\n

Delete \uff1a \u5176\u4e2d\u76ee\u5f55\u7ed3\u6784\u53d8\u5316\uff0c\u90fd\u8ba4\u4e3a\u662fDelete<\/p>\n

Edit\uff1a \u662f\u6307\u4fee\u6539\u6587\u4ef6<\/p>\n

Local \uff1a \u662f\u4f60\u672c\u5730\u4fee\u6539<\/p>\n

Incoming \uff1a\u662f\u522b\u4eba\u4fee\u6539\uff0c\u4f60\u8981Update\u6216Merge\u8fdb\u6765\u3002<\/p>\n

\u8fd9\u6837\u5e94\u8be5\u67094\u4e2a\u7ec4\u5408\uff0c\u4f46\u662fEdit\u5bf9Edit\u7684\u7ec4\u5408\u5e94\u8be5\u662fFile Conflict\uff0c\u8fd9\u4e2a\u5bb9\u6613\u89e3\u51b3\uff0c\u4e0d\u5728Tree Conflict \u8ba8\u8bba\u8303\u56f4\uff0c\u6240\u4ee5\u67093\u79cd\u7ec4\u5408\u3002\u518d\u9700\u8981\u533a\u522bUpdate\u548cMerge\uff0c\u5c31\u6709\u4e866\u79cd\u60c5\u51b5\u3002\u5206\u522b\u662f<\/span><\/p>\n

<\/a>Local delete, incoming edit upon update<\/span><\/h6>\n
Local edit, incoming delete upon update<\/span><\/h6>\n
Local delete, incoming delete upon update<\/span><\/h6>\n
Local missing, incoming edit upon merge<\/span><\/h6>\n
Local edit, incoming delete upon merge<\/span><\/h6>\n
Local delete, incoming delete upon merge<\/span><\/h6>\n
\u5206\u522b\u5bf9\u8fd9\u51e0\u79cd\u60c5\u5f62\u89e3\u91ca\u5982\u4e0b\uff1a<\/span><\/h6>\n
1.<\/span>Local delete, incoming edit upon update\uff08\u672c\u5730\u5220\u9664\uff0c\u66f4\u65b0\u540e\u4f20\u5165\u4fee\u6539\uff09<\/span><\/h6>\n
\u4ea7\u751f\u539f\u56e0\uff1a1.A\u4fee\u6539\u6587\u4ef6Foo.c\u540e\u63d0\u4ea4\u5230\u7248\u672c\u5e93\u4e2d\uff0cB\u5c06Foo.c\u91cd\u547d\u540d\u4e3aBar.c\u6216\u8005\u5220\u9664\u4e86Foo.c\u6216\u8005\u76f4\u63a5\u5c06Foo.c\u7684\u7236\u76ee\u5f55Foo\u76f4\u63a5\u5220\u9664 2.B\u66f4\u65b0\u5de5\u4f5c\u526f\u672c\u4f1a\u63d0\u793a\u8be5\u51b2\u7a81\uff0c\u5728working copy\u663e\u793a\u4e3aFoo.c\u5728\u672c\u5730\u5220\u9664\uff0c\u88ab\u6807\u8bb0\u4e3a\u51b2\u7a81\u3002\u5982\u679c\u662f\u91cd\u547d\u540d\uff0c\u5219Bar.c\u88ab\u6807\u8bb0\u4e3a\u65b0\u589e\uff0c\u4f46\u662f\u4e0d\u5305\u62ecA\u7684\u4fee\u6539\u3002<\/span><\/h6>\n
\u89e3\u51b3\uff1aA\u4e0eB\u8981\u786e\u8ba4\u662f\u5426\u91c7\u7528A\u7684\u4fee\u6539\u4e0e\u662f\u5426\u91cd\u547d\u540d\u3002\u5982\u679c\u91c7\u7528A\u7684\u4fee\u6539\uff0c\u5e76\u4e14\u8981\u91cd\u547d\u540d\u5219\u4fee\u6539\u540e\uff0c\u6807\u8bb0\u51b2\u7a81\u89e3\u51b3\uff0csvn resolved\uff0c\u6700\u540e\u63d0\u4ea4\uff1b\u5982\u679c\u4e0d\u91c7\u7528A\u7684\u4fee\u6539\uff0c\u76f4\u63a5\u6807\u8bb0\u51b2\u7a81\u89e3\u51b3\u63d0\u4ea4\u5373\u53ef\u3002<\/span><\/h6>\n
2.<\/span>Local edit, incoming delete upon update \uff08\u672c\u5730\u7f16\u8f91\uff0c\u66f4\u65b0\u540e\u4f20\u5165\u5220\u9664\uff09<\/span><\/h6>\n
\u4ea7\u751f\u539f\u56e0\uff1a1.A\u5bf9Foo.c\u91cd\u547d\u540d\u4e3aBar.c\u5e76\u63d0\u4ea4\u5230\u7248\u672c\u5e93\uff08\u6216\u8005A\u5c06Foo.c\u7684\u4e0a\u7ea7\u76ee\u5f55Foo\u4fee\u6539\u4e3aBar\uff09\uff0cB\u5728\u4ed6\u7684\u5de5\u4f5c\u526f\u672c\u4e2d\u5bf9Foo.c\u8fdb\u884c\u4fee\u6539\u30022.B\u63d0\u4ea4\u524d\u66f4\u65b0\uff0c\u4f1a\u63d0\u793a\u5982\u6b64\u9519\u8bef\u3002<\/span><\/h6>\n
\u89e3\u51b3\uff1a\u540c\u6837\u9700\u8981\u4e24\u4e2a\u4eba\u8fdb\u884c\u534f\u5546\u540e\u4fee\u6539\u3002<\/span><\/h6>\n
3.<\/span>Local delete, incoming delete upon update \uff08\u672c\u5730\u5220\u9664\uff0c\u66f4\u65b0\u540e\u4f20\u5165\u5220\u9664\uff09<\/span><\/h6>\n
\u4ea7\u751f\u539f\u56e0\uff1a1.A\u5c06Foo.c\u91cd\u547d\u540d\u4e3aBar.c\u540e\u63d0\u4ea4\uff0cB\u5bf9Foo.c\u91cd\u547d\u540d\u4e3aBix.c\u30022.B\u66f4\u65b0\u672c\u5730\u5de5\u4f5c\u526f\u672c\u662f\u4f1a\u63d0\u793a\u8be5\u6811\u51b2\u7a81\u3002<\/span><\/h6>\n
\u89e3\u51b3\uff1a\u901a\u8fc7\u65e5\u5fd7\u67e5\u627e\u6587\u4ef6\u88ab\u5220\u9664\u5373\u91cd\u547d\u540d\u7684\u539f\u56e0\uff0cA\u4e0eB\u534f\u5546\u540e\u6700\u7ec8\u786e\u8ba4\u91c7\u7528\u54ea\u4e2a\u540d\u79f0\u3002<\/span><\/h6>\n
4.<\/span>Local missing, incoming edit upon merge \uff08\u672c\u5730\u4e22\u5931\uff0c\u5408\u5e76\u540e\u4f20\u5165\u4fee\u6539\uff09<\/span><\/h6>\n
\u4ea7\u751f\u539f\u56e0\uff1a1.A\u5728\u4e3b\u5e72\u4e0a\u4fee\u6539Foo.c\uff0cB\u5728\u5206\u652f\u4e0a\u5c06Foo.c\u91cd\u547d\u540d\u4e3aBar.c\u30022.B\u5408\u5e76A\u5728\u4e3b\u5e72\u4e0a\u7684\u4fee\u6539\u3002<\/span><\/h6>\n
\u89e3\u51b3\uff1aB\u5148\u6807\u8bb0\u51b2\u7a81\u89e3\u51b3\uff0c\u7136\u540e\u5c06Foo.c\u62f7\u8d1d\u81f3\u672c\u5730\uff0c\u5c06A\u7684\u4fee\u6539\u5408\u5e76\u81f3\u81ea\u5df1\u7684\u6587\u4ef6\u4e2d\u6216\u8005\u76f4\u63a5\u653e\u5f03A\u7684\u4fee\u6539\uff0c\u91c7\u7528\u81ea\u5df1\u7684\u4fee\u6539\u3002<\/span><\/h6>\n
5.<\/span>Local edit, incoming delete upon merge \uff08\u672c\u5730\u4fee\u6539\uff0c\u5408\u5e76\u540e\u4f20\u5165\u5220\u9664\uff09<\/span><\/h6>\n
\u4ea7\u751f\u539f\u56e0\uff1a1.A\u5c06Foo.c\u91cd\u547d\u540d\u4e3aBar.c(\u6216\u8005\u5c06Foo.c\u7684\u7236\u76ee\u5f55Foo\u6539\u4e3aBar)\uff0cB\u5728\u5206\u652f\u4e0a\u4fee\u6539Foo.c\u30022.B\u5408\u5e76A\u7684\u4fee\u6539\u65f6\u63d0\u793a\u8be5\u51b2\u7a81\u3002Bar.c\u88ab\u6807\u8bb0\u4e3a\u589e\u52a0\uff0cFoo.c\u88ab\u6807\u8bb0\u4e3a\u51b2\u7a81\u3002<\/span><\/h6>\n
\u89e3\u51b3\uff1a\u540c\u6837\u6839\u636e\u65e5\u5fd7\u67e5\u627e\u5230\u4fee\u6539\u7684\u6e90\u5934\uff0c\u4e24\u4eba\u534f\u5546\u540e\u89e3\u51b3\u3002<\/span><\/h6>\n
6.<\/span>Local delete, incoming delete upon merge \uff08\u672c\u5730\u5220\u9664\uff0c\u5408\u5e76\u540e\u4f20\u5165\u5220\u9664\uff09<\/span><\/h6>\n
\u4ea7\u751f\u539f\u56e0\uff1a1.A\u5728\u4e3b\u5e72\u4e0a\u5c06Foo.c\u91cd\u547d\u540d\u4e3aBar.c\uff0cB\u5728\u5206\u652f\u4e0a\u5c06Foo.c\u91cd\u547d\u540d\u4e3aBix.c\u30022.B\u5408\u5e76A\u7684\u4fee\u6539\u65f6\u4f1a\u63d0\u793a\u51b2\u7a81\u3002\u91cd\u547d\u540d\u540e\u7684\u6587\u4ef6\u88ab\u6807\u8bb0\u4e3a\u65b0\u589e\uff0c\u539f\u6765\u6587\u4ef6\u88ab\u6807\u8bb0\u4e3a\u6811\u51b2\u7a81\u3002<\/span><\/h6>\n
\u89e3\u51b3\uff1a\u901a\u8fc7\u65e5\u5fd7\u67e5\u627e\u5230\u6587\u4ef6\u88ab\u6539\u540d\u7684\u65f6\u523b\uff0c\u4e24\u4eba\u534f\u5546\u540e\u89e3\u51b3\u3002<\/span><\/h6>\n<\/div>\n

 <\/p>\n

\u4e8c\u3001 2<\/p>\n

1\u3001\u5c06\u51b2\u7a81\u6587\u4ef6\u76ee\u5f55\u91cd\u547d\u540d\uff0c\u91cd\u65b0\u66f4\u65b0\uff0c
\n2\u3001\u5c06\u51b2\u7a81\u6587\u4ef6 svn resolved
\n3\u3001svn commit<\/p>\n

\u8c37\u6b4c\u7ed9\u51fa\u7684\u89e3\u51b3\u529e\u6cd5\u53c2\u8003\uff1a
\n1\u3001http:\/\/blog.csdn.net\/hantiannan\/article\/details\/5306194
\nEclipse\u5185SVN \u53f3\u51fb\u5de5\u7a0b\u76ee\u5f55\u2013>team\u2013>Show Tree Conflict\u2013>\u5728Eclpise\u4e2d\u4f1a\u51fa\u73b0\u4e00\u4e2aTab\u89c6\u56fe\u663e\u793aTree Conflict\u7684\u5185\u5bb9\uff0c\u4e00\u4e2a\u4e00\u4e2a\u9009\u62e9\u5217\u8868\u4e2d\u7684\u51b2\u7a81\u53f3\u51fb\u5c06\u5176\u6807\u5fd7\u4e3a\u5df2\u89e3\u51b3\uff0c\u7136\u540e\u56de\u5230\u9879\u76ee\u518d\u63d0\u4ea4\u66f4\u6539\u5c31\u53ef\u4ee5\u4e86\u3002<\/p>\n

2\u3001http:\/\/eyejava.iteye.com\/blog\/356109 \uff08\u66f4\u8be6\u7ec6\u529e\u6cd5\uff09<\/p>\n","protected":false},"excerpt":{"rendered":"

\u7ecf\u5e38\u6709\u4eba\u4f1a\u8bf4\uff0c\u6811\u51b2\u7a81\u662f\u5f88\u96be\u89e3\u51b3\u7684\u4e00\u7c7b\u51b2\u7a81\uff0c\u5176\u5b9e\u4e00\u65e6\u4e86\u89e3\u4e86\u5176\u539f\u7406\uff0c\u8981\u89e3\u51b3\u4e5f\u4e0d\u96be\u3002\u5148\u56de\u987e\u4e0b\u5bf9\u4e8e\u6811\u51b2\u7a81\u7684\u5b9a\u4e49\u3002 <\/p>\n

    \u6811\u51b2\u7a81\uff1a<\/span><\/b>\u5f53\u4e00\u540d\u5f00\u53d1\u4eba\u5458\u79fb\u52a8\u3001\u91cd\u547d\u540d\u3001\u5220\u9664\u4e00\u4e2a\u6587\u4ef6\u6216\u6587\u4ef6\u5939\uff0c\u800c\u53e6\u4e00\u540d\u5f00\u53d1\u4eba\u5458\u4e5f\u5bf9\u5b83\u4eec\u8fdb\u884c\u4e86\u79fb\u52a8\u3001\u91cd\u547d\u540d\u3001\u5220\u9664\u6216\u8005\u4ec5\u4ec5\u662f\u4fee\u6539\u65f6\u5c31\u4f1a\u53d1\u751f\u6811\u51b2\u7a81\u3002<\/span><\/div>\n
\u51fa\u73b0\u51b2\u7a81\u65f6\uff0c\u4e00\u822c\u4f1a\u63d0\u793a\u51b2\u7a81\u7684\u4fe1\u606f\u662f\u4ec0\u4e48\u3002\u8fc7\u540e\u6211\u4eec\u53ef\u4ee5\u4f7f\u7528svn st\u6765\u67e5\u770b\u5f53\u524d\u72b6\u6001\u3002svn st\u7684\u5404\u79cd\u72b6\u6001\u4ee3\u8868\u4ec0\u4e48\uff0c\u8bf7\u53c2\u8003\u6b64\u535a\u6587<\/span>svn st\u72b6\u6001\u8be6\u89e3<\/span><\/a>\u3002<\/span><\/div>\n
\u5148\u4ecb\u7ecd\u4e00\u4e0b\u6982\u5ff5<\/span><\/div>\n
\n

Delete \uff1a \u5176\u4e2d\u76ee\u5f55\u7ed3\u6784\u53d8\u5316\uff0c\u90fd\u8ba4\u4e3a\u662fDelete<\/p>\n

Edit\uff1a \u662f\u6307\u4fee\u6539\u6587\u4ef6<\/p>\n

Local \uff1a \u662f\u4f60\u672c\u5730\u4fee\u6539<\/p>\n

Incoming \uff1a\u662f\u522b\u4eba\u4fee\u6539\uff0c\u4f60\u8981Update\u6216Mer...<\/p>\n<\/div>\n

\u7ee7\u7eed\u9605\u8bfb →<\/span><\/a><\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"open","sticky":false,"template":"","format":"standard","meta":{"footnotes":""},"categories":[283],"tags":[117],"class_list":["post-304","post","type-post","status-publish","format-standard","hentry","category-technologys","tag-svn"],"_links":{"self":[{"href":"https:\/\/www.xiaobo.li\/notes\/wp-json\/wp\/v2\/posts\/304","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/www.xiaobo.li\/notes\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/www.xiaobo.li\/notes\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/www.xiaobo.li\/notes\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/www.xiaobo.li\/notes\/wp-json\/wp\/v2\/comments?post=304"}],"version-history":[{"count":0,"href":"https:\/\/www.xiaobo.li\/notes\/wp-json\/wp\/v2\/posts\/304\/revisions"}],"wp:attachment":[{"href":"https:\/\/www.xiaobo.li\/notes\/wp-json\/wp\/v2\/media?parent=304"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/www.xiaobo.li\/notes\/wp-json\/wp\/v2\/categories?post=304"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/www.xiaobo.li\/notes\/wp-json\/wp\/v2\/tags?post=304"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}