srp@babar.mmwb.ucsf.edu (Scott R. Presnell) (05/31/91)
Does anyone have a script or patch to "patch" that does an automagic checkin/checkout (basically ci -l) on a file before applying a patch? I find myself doing this manually quite often, and with the recent patches to cap60, the situation has again presented itself. Just trying to be organized (yeah, right, *organized hacking?*) - Scott Presnell (srp@cgl.ucsf.edu) -- Scott Presnell +1 (415) 476-9890 Pharm. Chem., S-926 Internet: srp@cgl.ucsf.edu University of California UUCP: ...ucbvax!ucsfcgl!srp San Francisco, CA. 94143-0446 Bitnet: srp@ucsfcgl.bitnet
bill@camco.Celestial.COM (Bill Campbell) (06/03/91)
In <srp.675705482@babar.mmwb.ucsf.edu> srp@babar.mmwb.ucsf.edu (Scott R. Presnell) writes: >Does anyone have a script or patch to "patch" that does an automagic >checkin/checkout (basically ci -l) on a file before applying a patch? I >find myself doing this manually quite often, and with the recent patches to >cap60, the situation has again presented itself. > Just trying to be organized (yeah, right, *organized hacking?*) I'm using cvs (on top of rcs) and use it's checkin program as I get revisions to third-party sources (with some pre-processing required because of file names > 12 characters on SysV). Checkin provides warnings about locally modified files and gives you an easy way to merge those changes with the new sources. I've found the easiest way to handle patches is to maintain a pure copy of the sources (not checked in to RCS locally) for patching purposes. This way I don't get a bunch of patches failed becauses of different RCS Revision numbers. This is particularly true with cvs which checks in outside sources on the 1.1.1 tree regardless of its original revision numbers. Currently I'm using cvs 1.2 and there may be a better solution to this in the current release, but I haven't had time to update rcs and cvs to the most recent release. I would appreciate it if someone has a better suggestion for handling this problem since I'm not totally happy with the way I'm doing it here. Bill -- INTERNET: bill@Celestial.COM Bill Campbell; Celestial Software UUCP: ...!thebes!camco!bill 6641 East Mercer Way uunet!camco!bill Mercer Island, WA 98040; (206) 947-5591