Next: Merging and keywords, Previous: Merging two revisions, Up: Branching and merging [Contents][Index]
¥Þ¡¼¥¸¤¹¤ëÊѹ¹ÅÀ¤Ë¡¢¥Õ¥¡¥¤¥ë¤Îºï½ü¤äÄɲä¬È¼¤Ê¤¦¾ì¹ç¤Ç¤â¡¢
update -j
¤Ïºï½ü¤äÄɲäòÈ¿±Ç¤·¤Þ¤¹¡£
¼Â¹ÔÎã:
cvs update -A touch a b c cvs add a b c ; cvs ci -m "added" a b c cvs tag -b branchtag cvs update -r branchtag touch d ; cvs add d rm a ; cvs rm a cvs ci -m "added d, removed a" cvs update -A cvs update -jbranchtag
¤³¤ì¤é¤Î¥³¥Þ¥ó¥É¤¬¼Â¹Ô¤µ¤ì¡¢‘cvs commit’ ¤¬¤Ê¤µ¤ì¤¿¸å¡¢´´¤Ç¤Ï¥Õ¥¡ ¥¤¥ë a ¤Ïºï½ü¤µ¤ì¡¢¥Õ¥¡¥¤¥ëd ¤ÏÄɲ䵤ì¤Þ¤¹