Go to the first, previous, next, last section, table of contents.


ÍÎÏÇÏËÒÁÔÎÏÅ ÓÌÉÑÎÉÅ ÉÚ ×ÅÔËÉ

íÙ ÐÒÏÄÏÌÖÁÅÍ ÏÂÓÕÖÄÅÎÉÅ ÐÒÉÍÅÒÁ. ôÅÐÅÒØ ÄÅÒÅ×Ï ÒÅ×ÉÚÉÊ ×ÙÇÌÑÄÉÔ ÔÁË:

+-----+    +-----+    +-----+    +-----+    +-----+
! 1.1 !----! 1.2 !----! 1.3 !----! 1.4 !----! 1.5 !   <- ÓÔ×ÏÌ
+-----+    +-----+    +-----+    +-----+    +-----+
                !                           *
                !                          *
                !   +---------+    +---------+
 ÷ÅÔ×Ø R1fix -> +---! 1.2.2.1 !----! 1.2.2.2 !
                    +---------+    +---------+

úÄÅÓØ ÌÉÎÉÑ ÉÚ Ú×ÅÚÄÏÞÅË ÐÒÅÄÓÔÁ×ÌÑÅÔ ÓÏÂÏÊ ÓÌÉÑÎÉÅ ×ÅÔËÉ `R1fix' Ó ÏÓÎÏ×ÎÙÍ ÓÔ×ÏÌÏÍ, ÏÂÓÕÖÄÁ×ÛÅÅÓÑ ÔÏÌØËÏ ÞÔÏ.

ðÒÅÄÐÏÌÏÖÉÍ ÔÅÐÅÒØ, ÞÔÏ ÒÁÚÒÁÂÏÔËÁ ×ÅÔËÉ `R1fix' ÐÒÏÄÏÌÖÁÅÔÓÑ:

+-----+    +-----+    +-----+    +-----+    +-----+
! 1.1 !----! 1.2 !----! 1.3 !----! 1.4 !----! 1.5 !   <- ÓÔ×ÏÌ
+-----+    +-----+    +-----+    +-----+    +-----+
                !                           *
                !                          *
                !   +---------+    +---------+    +---------+
 ÷ÅÔ×Ø 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


Go to the first, previous, next, last section, table of contents.