From owner-freebsd-gnome Fri Jan 17 11:16:22 2003 Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 41E6737B401 for ; Fri, 17 Jan 2003 11:16:21 -0800 (PST) Received: from httpd.terions.de (static62-99-146-055.adsl.inode.at [62.99.146.55]) by mx1.FreeBSD.org (Postfix) with SMTP id CA4F243F5B for ; Fri, 17 Jan 2003 11:16:18 -0800 (PST) (envelope-from martin.klaffenboeck@gmx.at) Received: (qmail 27718 invoked from network); 17 Jan 2003 19:16:12 -0000 Received: from unknown (HELO martin.kleinerdrache.org) (127.0.0.1) by loopback with SMTP; 17 Jan 2003 19:16:12 -0000 Date: Fri, 17 Jan 2003 20:16:11 +0100 From: Martin Klaffenboeck To: Joe Marcus Clarke Cc: freebsd-gnome@FreeBSD.ORG Subject: Re: Howto do ./marcusmerge ? Message-ID: <20030117191611.GI337@martin.kdrache.org> References: <20030117135722.V34734@small.pukruppa.de> <1042814311.14047.21.camel@ds9.webonaut.com> <20030117151710.GC337@martin.kdrache.org> <1042818446.14047.45.camel@ds9.webonaut.com> <20030117160226.GG337@martin.kdrache.org> <1042822996.328.10.camel@gyros> Mime-Version: 1.0 Content-Type: text/plain; format=flowed; charset=ISO-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1042822996.328.10.camel@gyros>; from marcus@marcuscom.com on Fr, Jan 17, 2003 at 18:03:16 +0100 X-Mailer: Balsa 2.0.3 Sender: owner-freebsd-gnome@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Am 2003.01.17 18:03 schrieb(en) Joe Marcus Clarke: > I like your modifications, and I'll commit them. However, I have to > agree with Franz. I don't think having a default directory is good at > all. I think I'll set to it nothing, then "assert" unless the user > changes it. > > Thanks for the submissions. You're welcome. ;-) Just one thing to prevent the user to checkout to a wrong directory, I added: ---diff starts here--- --- marcusmerge.orig Fri Jan 17 19:58:43 2003 +++ marcusmerge Fri Jan 17 20:10:14 2003 @@ -15,6 +15,8 @@ printf "First we have to checkout the ports module from\nhttp://www.marcuscom.com:8080/cgi-bin/cvsweb.cgi\nPlease type 'anoncvs' as your password.\n\n" cvs -d:pserver:anaonymous@creme-brulee.marcuscom.com:/space/cvs/marcuscom-cvs login echo "===> Checking out the ports module." + mkdir -p ${SRCDIR} + cd ${SRCDIR} ; cd .. cvs -z3 -d:pserver:anonymous@creme-brulee.marcuscom.com:/space/cvs/marcuscom-cvs co ports echo "===> Checkout done." fi --diff ends here--- The cvs co -d ${SRCDIR} didn't work, if ${SRCDIR} is an absolute path (sh extracts ~ to an absolute path). But this diff works fine, even if I don't know if this is really clean. Martin To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-gnome" in the body of the message