濡備綍merge浠ｇ爜?
寤鴻鐢ㄥ懡浠ゆ悶merge錛屽鎴風(fēng)鍥懼艦鐣岄潰涓嶆槸寰堢粰鍔涖?br />SVN 1.5浠ヤ笂鐗堟湰錛屽彲浠ヤ嬌鐢⊿VN鐨勮嚜鍔ㄥ悎騫訛細(xì)
灝嗕富騫插悎騫跺埌鍒嗘敮錛?br />榪涘叆鍒嗘敮鐩綍錛屾墽琛屽懡浠わ細(xì) svn merge http://server/dir/trunk
灝嗗垎鏀悎騫跺埌涓誨共錛?br />榪涘叆涓誨共鐩綍錛屾墽琛屽懡浠わ細(xì) svn merge http://server/dir/branch --reintegrate
娉細(xì) 濡傛灉涔嬪墠榪涜榪囦富騫插悎騫跺埌鍒嗘敮鐨勬搷浣滐紝璇峰姞鍙傛暟--reintegrate錛屽惁鍒欏彲鑳戒細(xì)鏈夊緢澶氫唬鐮佸啿紿佸嚭鐜般?br />
濡傛灉鏄疭VN1.5浠ヤ笅鐗堟湰錛屽彧鑳戒嬌鐢ㄦ墜宸ュ悎騫訛細(xì)
榪涘叆涓誨共鐩綍錛屾墽琛屽懡浠わ細(xì)svn merge -r version1:version2 http://server/dir/branch
灝哹ranch涓婁粠version1鍒皏ersion2鎵鍋氱殑鏀瑰姩鍚堝茍鍒頒富騫詫紝vension1 < version2
榪涘叆涓誨共鐩綍錛屾墽琛屽懡浠わ細(xì) svn merge -c version1 http://server/dir/branch
琛ㄧず灝唙ersion1嬈℃墍鍋氱殑鏀瑰姩鍚堝茍鍒頒富騫?br />
conficted
tree conficted
]]>
maven渚濊禆鍐茬獊鐨勪駭鐢熸槸鐢眒aven浼犻掓т緷璧栭犳垚鐨勶細(xì)
浠涔堟槸maven浼犻掍緷璧栵紵
“涓涓紶閫掓т緷璧栧氨鏄浜庝竴涓緷璧栫殑渚濊禆銆傚鏋減roject-a渚濊禆浜巔roject-b錛岃屽悗
鑰呮帴鐫渚濊禆浜巔roject-c錛岄偅涔坧roject-c灝辮璁や負(fù)鏄痯roject-a鐨勪紶閫掓т緷璧栥傚
鏋減roject-c渚濊禆浜巔roject-d錛岄偅涔坧roject-d灝變篃琚涓烘槸project-a鐨勪紶閫掓т緷
璧栥侻aven鐨勯儴鍒嗗惛寮曞姏鏄敱浜庡畠鑳藉綆＄悊浼犻掓т緷璧栵紝騫朵笖鑳藉甯姪寮鍙戣呭睆钄芥帀璺?br />韙墍鏈夌紪璇戞湡鍜岃繍琛屾湡渚濊禆鐨勭粏鑺傘備綘鍙互鍙緷璧栦簬涓浜涘寘濡係pring Framework錛岃屼笉
鐢ㄦ媴蹇僑pring Framework鐨勬墍鏈変緷璧栵紝Maven甯綘鑷姩綆＄悊浜嗭紝浣犱笉鐢ㄨ嚜宸卞幓璇︾粏浜嗚В
閰嶇疆銆?br />Maven鏄庢牱瀹屾垚榪欎歡浜嬫儏鐨勫憿錛熷畠寤虹珛涓涓緷璧栧浘錛屽茍涓斿鐞嗕竴浜涘彲鑳藉彂鐢熺殑鍐茬獊鍜?br />閲嶅彔銆備緥濡傦紝濡傛灉Maven鐪嬪埌鏈変袱涓」鐩緷璧栦簬鍚屾牱鐨刧roupId鍜宎rtifactId錛屽畠浼?xì)鑷?br />鏁寸悊鍑轟嬌鐢ㄥ摢涓緷璧栵紝閫夋嫨閭ｄ釜鏈鏂扮増鏈殑渚濊禆銆傝櫧鐒惰繖鍚搗鏉ュ緢鏂逛究錛屼絾鍦ㄤ竴浜涜竟鐣?br />鎯呭喌涓紝浼犻掓т緷璧栦細(xì)閫犳垚涓浜涢厤緗棶棰樸傚湪榪欑鎯呭喌涓嬶紝浣犲彲浠ヤ嬌鐢ㄤ緷璧栨帓闄ゃ?#8221;
——鎽樿嚜銆奙aven鏉冨▉鎸囧崡銆?br />
浠涔堟儏鍐典笅浼?xì)漶旂敓渚濊禆鍐步H侊紵
涓句緥璇存槑錛氶」鐩腑鐨刾om.xml閲屽０鏄庝簡瀵筽roject-a1.0涓巔roject-b2.0鐨勪緷璧栵紝鑰宲roject-a1.0鍙堜紶閫掍緷璧栦簬project-b1.0鐨勭増鏈?br />鍋囪maven緇忚繃鍒嗘瀽涔嬪悗鍐沖畾浣跨敤project-b1.0鐨勪緷璧栵紝涔熷氨鏄墦鍖呯殑鏃跺欐妸project-b1.0.jar鎵撹繘浜唚ar鍖呫?br />war鍖呴儴緗插湪java瀹瑰櫒涓惎鍔ㄤ箣鍚庯紝濡傛灉渚濊禆project-b2.0.jar涓柊娣葷殑綾繪垨鏂規(guī)硶錛屽氨浼?xì)鍙戠幇寮曠敤鐨劸c繪垨鑰呮柟娉曚笉瀛樺湪銆?br />榪欑鐜拌薄灝辨槸渚濊禆鍐茬獊銆?br />
濡備綍鍒嗘瀽渚濊禆鍐茬獊錛?br />mvn dependency:tree
鍐茬獊瑙ｅ喅鏂規(guī)錛?br />浣跨敤maven鎻愪緵鐨?lt;exclusion>鏍囩銆?br />涓句緥璇存槑錛?br />濡傛灉浣犳渚濊禆浜庝竴涓被搴擄紝璇ョ被搴撳張渚濊禆浜嶴un JTA API錛屼綘浼?xì)鎯宠鏇挎崲杩欎釜浼犻掓т緷璧栥?br />Hibernate鏄竴涓緥瀛愩侶ibernate渚濊禆浜嶴un JTA API錛岃屽悗鑰呭湪涓ぎMaven浠撳簱涓笉鍙敤錛屽洜涓哄畠鏄笉
鑳藉厤璐瑰垎鍙戠殑銆傚垢榪愮殑鏄紝Apache Gernoimo欏圭洰鍒涘緩浜嗕竴浜涘彲浠ュ厤璐瑰垎鍙戠殑鐙珛瀹炵幇
綾誨簱銆備負(fù)浜嗙敤鍙﹀鐨勪緷璧栨潵鏇挎崲榪欎釜浼犻掓т緷璧栵紝浣犻渶瑕佹帓闄よ繖涓紶閫掓т互渚濊禆錛岀劧鍚?br />鍦ㄤ綘鐨勯」鐩腑鍐嶅０鏄庝竴涓緷璧栥備笅闈㈠睍紺轟簡榪欐牱涓涓浛鎹㈢殑鏍蜂緥銆?
<dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate</artifactId> <version>3.2.5.ga</version> <exclusions> <exclusion> <groupId>javax.transaction</groupId> <artifactId>jta</artifactId> </exclusion> </exclusions></dependency><dependency> <groupId>org.apache.geronimo.specs</groupId> <artifactId>geronimo-jta_1.1_spec</artifactId> <version>1.1</version></dependency>]]>