tis 2006-05-16 klockan 22:14 +0200 skrev Guido Serassio: > A last question: > > The reference branch for me is the negotiate-nt-2_5 that is based on > nt-2_5 (based on s2_5) > > So I can do directly > > cvsmergeinit negotiate-nt-2_5 s2_5 > cvsmerge negotiate-nt-2_5 > > or I need to do things in two steps ?
Assuming negotiate-nt-2_5 is up to date with respect to nt-2_5 you should be able to run cvsmergeinit negotiate-nt-2_5 -r Z_nt-2_5_nerge_s2_5 but I have not verified this mode of operation. Warning: do not do this is the sub-branch is not up to date with it's parent. Regards Henrik
signature.asc
Description: Detta är en digitalt signerad meddelandedel
