aaaargh sorry, me stupid I merged from merge point on the trunk to the last merged-from on the branch.
The correct way is: [trunk]$ cvs update -j FROM -j TO file.txt where FROM and TO are *both* on the branch, e.g.: cvs update -j rel_5_0_1 -j rel_5_0_2 _______________________________________________ Info-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/info-cvs
