±à¼ÍƼö: |
±¾ÎÄÄÚÈÝÖ»°üº¬£ºÍ¨¹ýshellÔÚ·þÎñÆ÷ÉÏÀ´Ê¹ÓÃClearcase½øÐа汾¿ØÖƵĻù±¾²Ù×÷¡£
±¾ÎÄÀ´×ÔÓÚcsdn£¬ÓÉ»ðÁú¹ûÈí¼þAnna±à¼¡¢ÍƼö¡£ |
|
×ܽáClearcaseµÄ¿ª·¢Ê¹ÓÃ
ClearCase¾ÍÊÇÒ»¸öÈí¼þ¿ª·¢µÄ°æ±¾¿ØÖÆÏµÍ³£¬²»ÊìϤµÄÈË¿ÉÒÔ°ÑËüºÍgitÏàÀà±È£¬ÀàËÆÓÚwindowsºÍlinuxÊÇÁ½¸ö²Ù×÷ϵͳһÑù¡£
ClearCaseºÍGit¾ÍÊÇÁ½¸ö°æ±¾¿ØÖÆÏµÍ³¡£ËüÃǶ¼ÓÐÀàËÆµÄ²Ù×÷£¬²»¹ýÈ´Óв»Í¬µÄÃüÁîµÈ£¬¸üϸµÄ»°»¹Äܽ²µ½ÔÀíÉϵÄÇø±ð£¬ÕâÀï²»×÷׸Êö¡£
Ò»¡¢Ïȸ㶮2¸ö¸ÅÄelements, version.
a. ÔÚÒòΪclearcaseÊǰ汾¿ØÖÆÏµÍ³£¬¿ÉÒԺܼòµ¥µØÀí½âΪ£¬¶ÔÔªËØ½øÐа汾¿ØÖÆ¡£
b. elements=ÔªËØ,ÊÇÊý¾Ý¿âÖд洢µÄÎļþ»òÕßĿ¼¡£
c. version=°æ±¾£ºÃ¿Ò»¸öelement(Îļþ»òĿ¼)¶¼Óжà¸ö°æ±¾£¨±ÈÈçÎÒÃÇд±ÏÒµÂÛÎĵÄʱºò£¬»á¸øÃ¿´Î¸üеıÏÒµÂÛÎÄÈ¡ÃûΪ£º±ÏÒµÂÛÎÄv1,
±ÏÒµÂÛÎÄv20µÈ£©¡£
d. ËùÓеÄÎļþ£¬ÔÚ±»check out֮ǰ£¬¶¼ÊÇÖ»¶ÁµÄ£»
e. ½¨Á¢·ÖÖ§branchºÍºÏ²¢mergeµÄ²Ù×÷ÊÇûÓдÎÊýÏÞÖÆµÄ¡£
¶þ¡¢ÔÙÃ÷°×4¸öÃû´Ê£ºvob£¬label £¬branch£¬view
VOB£ºVersioned Object Base, ËüÊÇclearcaseÊý¾Ý¿â£¨´æ´¢elements
with versions£©£¬ËùÓпª·¢ÎļþµÄËùÓа汾¶¼ÔÚÕâ¸ö¿âÀïÃæ¡£±ÈÈçÒ»¸öÍŶӿª·¢ÁËÒ»¸öÈí¼þ£¬Õâ¸öÈí¼þÏà¹ØµÄËùÓпª·¢Îļþ¶¼´æÔÚvobÀÈç¹ûÈí¼þÔÚ²»Í£µü´ú£¬ÄÇôÔÚµü´ú¹ý³ÌÖвúÉúµÄËùÓÐÎļþÒ²¶¼´æÔÚvobÀï¡£
Ò»¸ö¹«Ë¾Ò»°ã»á¿ª·¢ºÜ¶à¿î²úÆ·£¬ÕâЩ²úÆ·µÄ¿ª·¢Îļþ¶¼ÔÚvobÀï¡£ÄÇô²»Í¬µÄ²úÆ·ÍŶÓΪÁË¿ª·¢×Ô¼º²úÆ·£¬»áÔÚvobÀï¶ÔӦλÖýøÐпª·¢¡£±ÈÈçÍŶÓA¿ª·¢µÄ²úÆ·ÊÇalpha,ÄÇËûÃǵĿª·¢Â·¾¶ÔÚ/vobs/alpha;ÍŶÓB¿ª·¢µÄ²úÆ·ÊÇbeta,ÄÇËûÃǵĿª·¢Â·¾¶ÔÚ/vobs/beta£»ÒÔ´ËÀàÍÆ¡£

ÕâÀïÓÐÒ»¸ö°æ±¾¿ØÖÆÊ÷¡£0£¬1£¬2£¬3£¬4£¬5±íʾµÄÊÇ °æ±¾ºÅ¡£
Label: ¹ËÃû˼Ò壬¾ÍÊDZêÇ©µÄÒâ˼¡£Í¨¹ý±êÇ©£¬ÎÒÃÇ¿ÉÒÔ¿ìËÙÕÒµ½ÏëÒªµÄÎļþ»òÕßĿ¼¡£
ÿһ¸öelement¿ÉÄÜÓµÓÐÏàͬµÄ±êÇ©£¬µ«ÊÇ£¬ÈκÎÒ»¸öelementµÄ°æ±¾Ê÷ÉϵÄij¸ölabelÃû³ÆÖ»ÓÐÒ»¸öʵÀý¡£±ÈÈçÏÂÃæµÄsource.cÕâ¸öÔªËØ£¬ËüµÄ°æ±¾Ê÷ÉÏ£¬´Ó0µ½5¸ö°æ±¾¶¼¿ÉÒÔ´ò±êÇ©£¬µ«ÊDZêÇ©¾ø²»ÄÜ´òÒ»ÑùµÄ£¬²»È»ÄãÔõôÕÒµ½¶ÔÓ¦°æ±¾ÄØ£¬Êǰɡ£ÄÇÈç¹û£¬ÏÖÔÚÓиöÔªËØsource1.c£¬ËüÒ²Óиö°æ±¾Ê÷£¬ËüµÄ¶ÔÓ¦°æ±¾µÄ±êÇ©¿ÉÒÔºÍsource.cµÄһģһÑù£¬Ò²¿ÉÒÔ²»Ò»Ñù¡£

a. Ò»¸öÔªËØµÄÈκΰ汾¶¼¿ÉÒÔÓжà¸ö±êÇ©¡£»¹ÊÇÓÃÉÏÃæÄǸöͼ¾ÙÀý×Ó£¬source.cµÄ°æ±¾1µÄ±êÇ©ÊÇLINGLONG1_1.0,ÎÒÃÇ»¹¿ÉÒÔ¸ø°æ±¾1ÔÙÉèÖøö±êÇ©È磺LL1_1.0;
b. ¸ù¾Ý´«Í³£¬±êÇ©ÃûÓ¦¸ÃËùÓÐ×Öĸ¶¼´óд¡£
c. ¸øÔªËØ´ò±êÇ©µÄÏà¹ØÃüÁîÊÇ£º $cleartool mkbrtype -global -pbranch LABEL_TYPE@VOB_TAG $cleartool mklabel -recurse $LABEL_TYPE$ELEMENT
//°Ñ±êÇ©LABEL_TYPE´ïµ½ÔªËØELEMENTÉÏ
d. Áгö±êÇ©£º $cleartool lstype -kind lbtype
Branch: ·ÖÖ§¡£¹ËÃû˼Òå¾ÍÏñÊÇÒ»¿ÃÊ÷µÄÖ÷¸ÉÉϳ¤³öÁË·ÖÖ§Ò»Ñù¡£Ã¿¸öÔªËØ¶¼ÓÐÒ»¸ö°æ±¾Ê÷£¬¶Ô°É¡£ÄDZÈÈçÏÖÔÚ£¬ÎÒÒª¶Ô²úÆ·ÖеÄÒ»¸ö¹¦ÄܽøÐиĽø»òÕßÊÇÒªÐÞ¸´Ò»¸öbug,¼ÙÉèÕâ¸ö¹¦ÄÜ´úÂë»òÕßbugµÄλÖÃÔÚÏà¹ØÔªËØ°æ±¾Ê÷ÉϵıêǩΪT1_3.0µÄµØ·½¡£ÄÇÎÒÃǾʹÓÕâ¸ö±êÇ©ÕâÀïн¨Ò»¸ö·ÖÖ§£¬±íÃ÷ÎÒÒª¶Ô¸ÃÔªËØÄ³°æ±¾½øÐи͝À²¡£·ÖÖ§Ãû×־ͽÐ×öT1_myName£¬Ã¿¸öÈ˶¼²»ÄܸÉÈűðÈ˵Ŀª·¢¡£

a. ÈçÉÏͼ£¬ÎÒ´ÓT1_1.0ÄÇÀィÁËÒ»¸ö·ÖÖ§£¬ÎÒÔÚ×Ô¼ºµÄ·ÖÖ§ÉϽøÐпª·¢£¬¿ª·¢µÄ×îа汾Ϊ2¡£±ðÈËÒ²ÔÚÕâÀィÁËÒ»¸öËûµÄ·ÖÖ§£¬²»¹ýÕâ¸úÎÒ²»³åÍ»¡£
b. ¸øÄãÃÇ¿´¿´ÕæÊµ¿ª·¢¹ý³ÌÖеĸ´ÔÓ³¡¾°£¬¹þ¹þ¹þ¹þ

view:¾ÍÊÇworkspace. ͨ¹ýviewÀ´Ñ¡Ôñelement£¨Îļþ»òĿ¼£©µÄij¸ö°æ±¾¡£ÕâÑùµÄ»°Ã¿¸ö¿ª·¢ÕߵŤ×÷¾Í»¥²»¸ÉÈÅÀ²¡£
a. viewµÄһЩ³£¼û²Ù×÷£º i) ½øÈëÒ»¸öview:$cleartool setview VIEWNAME ii) ÁгöÏÖÓÐview£ºcleartool lsview iii) ÁгöĿǰ½øÈëµÄview:$cleartool pwv iv) Í˳öÒ»¸öview:$exit v) н¨view:$cleartool mkview -tag tmpA_view? /hosts/node-name/home/cleardata/viws/tmepA_view
b. ±ÈÈçÎÒÏÖÔÚûÓÐÌ«¶àClearcaseϵĿª·¢¾Ñé¡£ÎÒÏ뽨һ¸ö×Ô¼ºµÄworkspaceÀ´Á·Ï°Ò»¸ö²Ù×÷¡£ÓÚÊÇÎÒ¾ÍÏÈȥн¨Ò»¸öview
by¸´ÖÆÒ»¸ö±ðÈ˵Äview.¾ßÌå²Ù×÷ÈçÏ£º i) ±ðÈ˵ÄviewµÄ±êÇ©¼ÙÉèÊÇalpha_project.1_tom£» ii) ÎÒÏȽøÈëµ½Õâ¸öview:$cleartool setview alpha_project.1_tom£» iii) ͨ¹ýÕâ¸öviewÀ´newÒ»¸ö×Ô¼ºµÄview£» iv) ÔÙ´ÎÓÃ$cleartool setview myviewÀ´set¹¤×÷view£» v) new Ò»¸öbranch, ÔÚbranchÉÏcheck out Ò»¸öÎļþ£» vi) ¶Ôcheck outÁ˵ÄÎļþ½øÐÐÐ޸ģ» vii) °ÑÕâ¸öÎļþcheck in »Ø×Ô¼ºµÄbranch£» viii) °ÑÕâ¸öÎļþmergeµ½°æ±¾Ê÷µÄÖ÷¸ÉÉÏ?£»
Èý¡¢Configuration Specitication
a. ÿ¸öview¶¼ÓÐÒ»¸öÅäÖÃÎļþ£ºËü¶¨ÒåÁËÑ¡Ôñelement°æ±¾µÄ¹æÔò¡£
b. ÿµ±Äãн¨Ò»¸öview,¾Í»á×Ô¶¯Éú³ÉÒ»¸ödefault config spec£¨Ä¬ÈÏÅäÖÃÎļþ£©¡£
c. Õâ¸öĬÈÏÅäÖÃÎļþɸѡµÄ Îļþ»òĿ¼ÊÇÕâÑùµÄ£º i) ±»check outÁ˵ģ»
ii) Êǰ汾Ê÷Ö÷¸ÉÉϵÄ×îа汾¡£

d. ÒªÐÞ¸ÄÅäÖÃÎļþ£¬ÃüÁîÊÇ£º$cleartool edcs??? (edcs Òâ˼ÊÇedit config
spec)
e. ²é¿´ÅäÖÃÎļþµÄÃüÁî:$cleartool catcs? (catcs Òâ˼ÊÇcat config
spec)
ÎÒÃÇÒѾ֪µÀ£¬Òª½øÐÐ×Ô¼ºµÄ¿ª·¢¹¤×÷ʱ£¬ÐèÒªÏȽ¨Á¢Ò»¸ö×Ô¼ºµÄ·ÖÖ§branch£¬È»ºóÔÚ×Ô¼ºµÄbranchÉÏÒªÐÞ¸ÄÒ»¸öelementµÄʱºò£¬±ØÐëÏȶÔÕâ¸öelement½øÐÐcheck
out²Ù×÷¡£Èç¹ûÎÒÃÇÏÖÔÚÖ±½Ó¶ÔÒ»¸öelement½øÐÐcheck out£¬Äã²Â»á·¢Éúʲô£¿ÄãÔÚÏ룬ÔÛÃǵÄbranch¶¼Ã»½¨ÄØ£¬ÔõôÄÜcheck
outÒ»¸öelementÄØ£¿Ã»´í£¬±ØÐëÒªÔÚ·ÖÖ§ÉϲÅÄܶÔÔªËØ½øÐÐcheck out£¬ÕâÖÖÖ±½Ócheck
outÎļþ»òĿ¼µÄ²Ù×÷£¬»á´¥·¢Ò»¸ö×Ô¶¯½¨Á¢·ÖÖ§µÄ¼¶Áª²Ù×÷¡£
ËÄ¡¢Check out
a. ¶ÔÎļþ»òĿ¼check outºó£¬ÎÒÃDzÅÄܶÔËüÃǽøÐÐÐ޸ġ£
b. Èç¹ûÒ»¸öÔªËØÒÔ¼°±»check out Ϊ¡°reserved¡±,ÄǾͲ»ÄÜÔÙ°ÑËücheck outΪ¡°reserved¡±,Ö»ÄܰÑËücheck
outΪ"unreserved".
c. ±»check outΪ"unreserved"µÄÎļþ£¬ÔÚ¡°reserved¡±Îļþ¹ÒÆðµÄʱºò£¬ÊDz»Äܱ»check
inµÄ¡£
d. Èç¹ûÏë°Ñ¡°unreserved¡±Îļþcheck in£¬ ÄÇô±ØÐëÏÈ ½â¾ö¡°reserved¡±checkouts.
e. check out Ò»¸öELEMENTµÄÃüÁîÊÇ: $Cleartool co -nc ELEMENT
Îå¡¢Check in
a. check in Îļþ»òÕßĿ¼»á°Ñа汾µÄÔªËØÌí¼Óµ½VOBÖС£
b. check in Ò»¸öELEMENTµÄÃüÁîÊÇ :$cleartool ci -nc ELEMENT
$cleartool unco ELEMENT
Áù¡¢Ìí¼ÓELEMENT
a. ¸ø°æ±¾¿ØÖÆ¿âÖÐÌí¼ÓelementµÄÃüÁîÊÇ:$cleartool mkelem ELEMENT£¨Õâ¸öELEMENTÓ¦¸ÃÊÂÏÈ´æÔÚ£¬ÇÒËüµÄ¸¸Ä¿Â¼Ó¦¸ÃÒѾ±»check
outÁË£©
b. н¨Ä¿Â¼£º$cleartool mkdir DIRECTORY£¨Õâ¸öDIRECTORY²»ÄÜÒÑ´æÔÚÇÒËüµÄ¸¸Ä¿Â¼Ó¦¸ÃÒѾ±»check
outÁË£©
c. µ¼ÈëĿ¼£º$clearfsimport -recurse -nsetevent SOURCE
TARGET
d. ɾ³ýÔªËØ£º$cleartool rmelem ELEMENT
e. ²é¿´ËùÓÐnocheckout״̬µÄÔªËØ£º$cleartool ls?
Æß¡¢MergeºÏ²¢£¨°ÑÐ޸ĺóµÄÔªËØmergeµ½Ä³¸ö°æ±¾ÉÏ£©
a. Õâ¸ömergeÊÇÓÃÀ´ºÏ²¢±»Ð޸ĹýµÄÎļþ¡£
b. Merge ֮ǰһ¶¨ÒªÏÈ review code,²»½ö×Ô¼º£¬»¹ÓÐÉϼ¶review,
Ö±µ½Éϼ¶reviewͨ¹ýÖ®ºó²ÅÄÜmerge.

c. mergeÏà¹ØµÄÃüÁ
$cleartool merge
$cleartool diff
|
d. Áгö¿ÉÒÔmergeµÄÎļþ: $cleartool findmerge . -ftag VIEW_TAG
-print
e. Áгö¿ÉÒÔmergeµÄÎļþ²¢×Ô¶¯merge: $cleartool findmerge . -ftag
VIEW_TAG -nc -merge
°Ë¡¢²éѯcleartoolµÄÆäËûÃüÁî¿ÉÒÔÓÃ
$cleartool man
$cleartool man COMMAN |
|