Next: Merging two revisions, Previous: Merging a branch, Up: Branching and merging [Contents][Index]
Á°Àá¤ÎÎã¤ò³¤±¤ë¤È¡¢ ¸½ºß¤Î¥ê¥Ó¥¸¥ç¥ó¡¦¥Ä¥ê¡¼¤Ï¼¡¤ÎÍͤˤʤäƤ¤¤Þ¤¹:
+-----+ +-----+ +-----+ +-----+ +-----+ ! 1.1 !----! 1.2 !----! 1.3 !----! 1.4 !----! 1.5 ! <- The main trunk +-----+ +-----+ +-----+ +-----+ +-----+ ! * ! * ! +---------+ +---------+ Branch R1fix -> +---! 1.2.2.1 !----! 1.2.2.2 ! +---------+ +---------+
Á°Àá¤Ç»Þ ‘R1fix’ ¤ò´´¤Ë¥Þ¡¼¥¸¤·¤¿»ö¤ò¡¢¤³¤³¤Ç¤ÏÀ±Àþ¤Çɽ¤·¤Þ¤¹¡£
¼¡¤Ë¡¢»Þ ‘R1fix’ ¤Ç³«È¯¤¬Â³¤±¤é¤ì¤¿¤È²¾Äꤷ¤Þ¤¹:
+-----+ +-----+ +-----+ +-----+ +-----+ ! 1.1 !----! 1.2 !----! 1.3 !----! 1.4 !----! 1.5 ! <- The main trunk +-----+ +-----+ +-----+ +-----+ +-----+ ! * ! * ! +---------+ +---------+ +---------+ Branch R1fix -> +---! 1.2.2.1 !----! 1.2.2.2 !----! 1.2.2.3 ! +---------+ +---------+ +---------+
¤½¤·¤Æ¤³¤Î¿·¤·¤¤Êѹ¹¤ò´´¤Ë¥Þ¡¼¥¸¤·¤¿¤¯¤Ê¤ê¤Þ¤·¤¿¡£
¤³¤³¤ÇºÆ¤Ó cvs update -j R1fix m.c
¥³¥Þ¥ó¥É¤òÍѤ¤¤¿¾ì¹ç¡¢
CVS ¤Ï´û¤Ë¥Þ¡¼¥¸¤µ¤ì¤¿Êѹ¹ÅÀ¤ò½Å¤Í¤Æ¥Þ¡¼¥¸¤·¤è¤¦¤È¤·¤Æ¡¢
˾¤Þ¤·¤¯¤Ê¤¤·ë²Ì¤ò¤â¤¿¤é¤·¤Þ¤¹¡£
¤½¤³¤Ç¡¢ ̤¤À´´¤Ë¥Þ¡¼¥¸¤µ¤ì¤Æ¤Ê¤¤Êѹ¹ÅÀ¤À¤±¥Þ¡¼¥¸¤·¤¿¤¤»Ý¤ò¡¢ ÌÀ¼¨¤¹¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£ ¤³¤ì¤Ë¤Ï¡¢‘-j’ ¥ª¥×¥·¥ç¥ó¤ÇÆó¤Ä¤Î¥ê¥Ó¥¸¥ç¥ó¤ò»ØÄꤷ¤Þ¤¹¡£ CVS ¤Ï¡¢ ºÇ½é¤Î¥ê¥Ó¥¸¥ç¥ó¤«¤é¼¡¤Î¥ê¥Ó¥¸¥ç¥ó¤Þ¤Ç¤ÎÊѹ¹¤ò¥Þ¡¼¥¸¤·¤Þ¤¹¡£ Î㤨¤Ð¡¢¤³¤Î¾ì¹ç¡¢ºÇ¤â´Êñ¤ÊÊýË¡¤Ï¼¡¤ÎÍͤˤʤê¤Þ¤¹¡£
cvs update -j 1.2.2.2 -j R1fix m.c # 1.2.2.2 ¤«¤é¡¢»Þ R1fix ¤Î # ÀèÆ¬¤Þ¤Ç¤ÎÊѹ¹¤ò¥Þ¡¼¥¸¤¹¤ë
¤³¤ÎÊýË¡¤ÎÌäÂêÅÀ¤Ï¡¢¥ê¥Ó¥¸¥ç¥ó 1.2.2.2 ¤ò¼«Ê¬¤Ç»ØÄꤹ¤ëɬÍפ¬¤¢¤ë»ö¤Ç¤¹¡£ ºÇ¸å¤Ë¥Þ¡¼¥¸¤¬¹Ô¤ï¤ì¤¿Æü»þ¤ò»ÈÍѤ¹¤ëÊý¤¬¡¢¾¯¤·¤Þ¤·¤Ç¤·¤ç¤¦:
cvs update -j R1fix:yesterday -j R1fix m.c
¤µ¤é¤ËÎɤ¤¤Î¤Ï¡¢ Êѹ¹ÅÀ¤ò´´¤Ë¥Þ¡¼¥¸¤¹¤ëÅ٤ˡ¢ »Þ ‘R1fix’ ¤Ë¥¿¥°¤ò¿¶¤Ã¤Æ¤ª¤¡¢ ¸å¤Ç¥Þ¡¼¥¸¤¹¤ë»þ¤Ë¤½¤Î¥¿¥°¤òÍѤ¤¤ëÊýË¡¤Ç¤¹:
cvs update -j merged_from_R1fix_to_trunk -j R1fix m.c