Next: , Previous: Informing others, Up: Multiple developers   [Contents][Index]


10.5 Ʊ»þ¤Ë CVS ¤Î¼Â¹Ô¤ò»î¤ß¤ëÊ£¿ô¤Î³«È¯¼Ô

Ê£¿ô¤Î³«È¯¼Ô¤¬Æ±»þ¤Ë CVS ¤ò¼Â¹Ô¤·¤è¤¦¤È¤·¤¿¾ì¹ç¡¢ ¼¡¤Î¤è¤¦¤Ê¥á¥Ã¥»¡¼¥¸¤¬É½¼¨¤µ¤ì¤Þ¤¹:

[11:43:23] waiting for bach's lock in /usr/local/cvsroot/foo

CVS ¤Ï 30ÉÃËè¤Ë¼Â¹Ô¤ò»î¤ß¡¢ ¤Þ¤ÀÂÔ¤ÄɬÍפ¬¤¢¤ì¤ÐºÆÅÙ¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·¡¢ ¤½¤¦¤Ç¤Ê¤±¤ì¤Ð½èÍý¤ò³¤±¤Þ¤¹¡£ ÉÔŬÅö¤ÊĸŤ¯ÂÔ¤Á³¤±¤Æ¤¤¤ë¤è¤¦¤Ê¤é¤Ð¡¢ ¥í¥Ã¥¯¤µ¤»¤Æ¤¤¤ë¿Íʪ¤ò¸«ÉÕ¤±¤Æ¡¢ ¼Â¹ÔÃæ¤Î cvs ¥³¥Þ¥ó¥É¤ò¿Ö¤¤¤Æ¤ß¤Æ²¼¤µ¤¤¡£ cvs ¥³¥Þ¥ó¥É¤¬¼Â¹Ô¤µ¤ì¤Æ¤Ê¤¤¤Î¤Ê¤é¤Ð¡¢¥á¥Ã¥»¡¼¥¸¤Ç½ñ¤«¤ì¤Æ¤¤¤ë¥ê¥Ý¥¸¥È ¥ê¥Ç¥£¥ì¥¯¥È¥ê¤ò¸«¤Æ¡¢ÈàÅù¤¬½êÍ­¤·¤Æ¤¤¤ë #cvs.tfl, #cvs.rfl, #cvs.wfl ¤È¤¤¤¦Ì¾Á°¤Ç»Ï¤Þ¤ë¥Õ¥¡¥¤¥ë¤òÁܤ·¤Æ¡¢ºï½ü¤·¤Æ²¼¤µ¤¤¡£

¤³¤Î¥í¥Ã¥¯¤Ï CVS ¤ÎÆâÉô¥Ç¡¼¥¿¹½Â¤¤òÊݸ¤ë¤â¤Î¤Ç¡¢ RCS ¤Ç»ÈÍѤµ¤ì¤ë¥í¥Ã¥¯ (lock) ¤È¤¤¤¦¸ÀÍդȤÏÁ´¤¯²¿¤Î´Ø·¸¤â¤Ê¤¤¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£ RCS ¤Î¥í¥Ã¥¯¤Ë¤Ä¤¤¤Æ¤Ï¡¢ ÆÈÀê¼èÆÀ¤Ë¤Ä¤¤¤Æ¤Îµ­½Ò¤ò»²¾È¤·¤Æ²¼¤µ¤¤ (see Multiple developers)¡£

Ǥ°Õ¤Î¥ê¥Ý¥¸¥È¥ê¤«¤é²¿¿Í¤Ç¤â¡¢ Ʊ»þ¤ËÆÉ¤ß½Ð¤¹¤³¤È¤¬²Äǽ¤Ç¤¹¡£ 狼¤¬½ñ¤­¹þ¤ßÃæ¤Î¾ì¹ç¤Ë¤À¤±¡¢ ¾¤Î¿Í¤ÎÆÉ¤ß½Ð¤·¤ä½ñ¤­¹þ¤ß¤¬¶Ø»ß¤µ¤ì¤Þ¤¹¡£

¼¡¤Ë¼¨¤¹¤è¤¦¤Êưºî¤ò˾¤à¿Í¤¬¤¤¤ë¤Ç¤·¤ç¤¦

¤¢¤ë¿Íʪ¤¬°ì¤Ä¤Î cvs ¥³¥Þ¥ó¥É¤ÇÊ£¿ô¤Î¥Õ¥¡¥¤¥ë¤ËÂФ¹¤ëÊѹ¹ÅÀ¤ò
³ÊǼ¤·¤¿»þ¡¢Â¾¤Î狼¤¬Æ±»þ¤Ë update ¤ò¼Â¹Ô¤¹¤ë¤È¡¢Á´¤Æ¤Î¥Õ¥¡¥¤¥ë¤¬
¹¹¿·¤µ¤ì¤ë¤«¡¢Á´¤¯¹¹¿·¤µ¤ì¤Ê¤¤¤«¤Î¤É¤Á¤é¤«¤Ç¤¢¤ë¡£

¤¬¡¢CVS ¤Ï¤³¤Î¤è¤¦¤Ëưºî¤·¤Þ¤»¤ó¡£ Î㤨¤Ð°Ê²¼¤Î¥Õ¥¡¥¤¥ë¤¬¤¢¤ë¤È¤·¤Æ¡¢

a/one.c
a/two.c
b/three.c
b/four.c

¤¢¤ë¿Íʪ¤¬¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤¿»þ¡¢

cvs ci a/two.c b/three.c

Ʊ»þ¤Ë¾¤Î狼¤¬ cvs update ¤ò¼Â¹Ô¤·¤¿¾ì¹ç¡¢ update ¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¿Í¤Ï b/three.c ¤ÎÊѹ¹ÅÀ¤Î¤ß¤¬¹¹¿·¤µ ¤ì¡¢ a/two.c ¤ÎÊѹ¹ÅÀ¤Ï¹¹¿·¤µ¤ì¤Ê¤¤¤Ç¤·¤ç¤¦¡£