From owner-freebsd-chat@FreeBSD.ORG Sat Jun 4 04:53:14 2005 Return-Path: X-Original-To: freebsd-chat@freebsd.org Delivered-To: freebsd-chat@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8CA4516A41C for ; Sat, 4 Jun 2005 04:53:14 +0000 (GMT) (envelope-from reed@reedmedia.net) Received: from pilchuck.reedmedia.net (pilchuck.reedmedia.net [209.166.74.74]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2070643D48 for ; Sat, 4 Jun 2005 04:53:13 +0000 (GMT) (envelope-from reed@reedmedia.net) Received: from reed by pilchuck.reedmedia.net with local-esmtp (Exim 3.12 #1 (Debian)) id 1DeQeg-0001bK-00; Fri, 03 Jun 2005 21:53:06 -0700 Date: Fri, 3 Jun 2005 21:53:06 -0700 (PDT) From: "Jeremy C. Reed" To: freebsd-chat@freebsd.org Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Subject: scripts for working with rcs? X-BeenThere: freebsd-chat@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Non technical items related to the community List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jun 2005 04:53:14 -0000 I am looking for some ideas or scripts for working with rcs (or roll your own) to help with the following: A project I use doesn't have any public CVS, but have snapshot tarballs. So I want to download via cron each night, extract and do a "ci" check-in. I will be making my own local modifications also (which may conflict). So I want to merge in the changes via rcsmerge (and diff3 -E style). I am hoping to automate all this. Basically, I am trying to recreate "cvs up -dP" behaviour that will merge in my own changes cleanly or add conflict lines (if necessary), so I can easily share my "rcsdiff -u" changes. I guess rcs is not needed, but anything to automate the rcsmerge/diff3 type work would be good. I guess I could have a directory with my work. And a directories with previous snapshot and latest daily snapshot. Then script this daily download, extraction, running diff3 and replace my version with the new diff3 -E result. Jeremy C. Reed open source, Unix, *BSD, Linux training http://www.pugetsoundtechnology.com/