Continuing our example, the revision tree now looks like this:
+-----+ +-----+ +-----+ +-----+ +-----+ ! 1.1 !----! 1.2 !----! 1.3 !----! 1.4 !----! 1.5 ! <- The main trunk +-----+ +-----+ +-----+ +-----+ +-----+ ! * ! * ! +---------+ +---------+ Branch R1fix -> +---! 1.2.2.1 !----! 1.2.2.2 ! +---------+ +---------+
where the starred line represents the merge from the R1fix branch to the main trunk, as just discussed.
Now suppose that development continues on the R1fix branch:
+-----+ +-----+ +-----+ +-----+ +-----+ ! 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 ! +---------+ +---------+ +---------+
and then you want to merge those new changes onto the main trunk. If you just use the cvs update -j R1fix m.c command again, cvsnt will remember that you have previously merged any only merge the new changes. You can override this by using the cvs update -b -j command, which will attempt to merge again the changes which you have already merged, which can have undesirable side effects.