I've figured it out - the commands needed are:
1. Get 0.15 version of file (eg. rel_0_15 of gtkprefs.c)
cvs update -rrel_0_15 gtkprefs.c
2. Merge fix (eg. change 1.136)
cvs update -j1.135 -j1.136 gtkprefs.c
3. Check it in and then change back to head version:
cvs ci
cvs update -A gtkprefs.cJon Christian Anthon wrote: > I meant checkout the 0.15 branch in a separate directory and then > >> cvs update -j1.135 -j1.136 gtkprefs.c >> >> resolve any conflicts, edit the ChangeLog and then >> >> cvs ci >> >> Christian. >> > >
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Bug-gnubg mailing list [email protected] http://lists.gnu.org/mailman/listinfo/bug-gnubg
