Next: Recursive behavior, Previous: Revisions, Up: Top [Contents][Index]
CVS ¤Ç¤ÏÊѹ¹¤ò »Þ (branch) ¤È¤·¤ÆÃΤé¤ì¤ëÊ̤γ«È¯¥é¥¤¥ó¤Ë ʬ¤±¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£»Þ¤Î¥Õ¥¡¥¤¥ë¤òÊѹ¹¤·¤Æ¤â¡¢¤½¤ÎÊѹ¹¤Ï´´¤ä¾¤Î»Þ¤Ë ¤Ï¸½¤ì¤Þ¤»¤ó¡£
¸åÄø¡¢¥Þ¡¼¥¸ (merging) ¤Ë¤è¤Ã¤ÆÊѹ¹¤ò¤¢¤ë»Þ¤«¤éÊÌ¤Î»Þ (¤â
¤·¤¯¤Ï´´) ¤Ë°Üư¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£¥Þ¡¼¥¸¤Ï¤Þ¤º cvs update -j
¤ò¼Â¹Ô¤·¤Æ¡¢Êѹ¹¤òºî¶È¥Ç¥£¥ì¥¯¥È¥ê¤Ëº®¤¼¤ë¤³¤È¤«¤é»Ï¤Þ¤ê¤Þ¤¹¡£¤½¤ì¤«¤é
¤½¤Î¥ê¥Ó¥¸¥ç¥ó¤ò³ÊǼ¤¹¤ë¤³¤È¤¬¤Ç¤¡¢¤³¤¦¤·¤Æ¸ú²ÌŪ¤ËÊѹ¹¤òÊ̤λޤ˥³¥Ô¡¼
¤¹¤ë¤³¤È¤¬¤Ç¤¤Þ¤¹¡£
• Branches motivation: | »Þ¤Ï²¿¤ÎÌò¤ËΩ¤Ä¤« | |
• Creating a branch: | »Þ¤ÎºîÀ® | |
• Accessing branches: | »Þ¤Î¹¹¿·¤È¼è¤ê½Ð¤· | |
• Branches and revisions: | »Þ¤Ï¥ê¥Ó¥¸¥ç¥óÈÖ¹æ¤ËÈ¿±Ç¤µ¤ì¤ë | |
• Magic branch numbers: | ËâË¡¤Î»ÞÈÖ¹æ | |
• Merging a branch: | »ÞÁ´ÂΤò¥Þ¡¼¥¸¤¹¤ë | |
• Merging more than once: | »Þ¤«¤é²¿ÅÙ¤â¥Þ¡¼¥¸¤¹¤ë | |
• Merging two revisions: | Æó¤Ä¤Î¥ê¥Ó¥¸¥ç¥ó´Ö¤Îº¹Ê¬¤ò¥Þ¡¼¥¸¤¹¤ë | |
• Merging adds and removals: | ¥Õ¥¡¥¤¥ë¤¬ÄɲÃ/ºï½ü¤µ¤ì¤¿¾ì¹ç¤Ï¤É¤¦¤«? | |
• Merging and keywords: | ¥¡¼¥ï¡¼¥ÉÃÖ´¹¤Ë¤è¤ë¾×ÆÍ¤ò²óÈò¤¹¤ë |