From owner-freebsd-gnome@FreeBSD.ORG  Mon May 26 18:03:00 2003
Return-Path: <owner-freebsd-gnome@FreeBSD.ORG>
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 5226C37B404
	for <gnome@freebsd.org>; Mon, 26 May 2003 18:03:00 -0700 (PDT)
Received: from dsl-mail.kamp.net (mail.kamp-dsl.de [195.62.99.42])
	by mx1.FreeBSD.org (Postfix) with SMTP id 01BD643F75
	for <gnome@freebsd.org>; Mon, 26 May 2003 18:02:58 -0700 (PDT)
	(envelope-from root@pukruppa.de)
Received: (qmail 31653 invoked by uid 505); 27 May 2003 01:13:15 -0000
Received: from root@pukruppa.de by dsl-mail by uid 502 with qmail-scanner-1.14
	 (spamassassin: 2.43.  Clear:. 
	Processed in 0.146972 secs); 27 May 2003 01:13:15 -0000
Received: from unknown (HELO reverse-213-146-114-24.dialin.kamp-dsl.de)
	(213.146.114.24)
	by dsl-mail.kamp.net with SMTP; 27 May 2003 01:13:14 -0000
Date: Tue, 27 May 2003 03:03:05 +0200 (CEST)
From: "P. U. Kruppa" <root@pukruppa.de>
To: Joe Marcus Clarke <marcus@freebsd.org>
In-Reply-To: <1053728774.966.0.camel@gyros>
Message-ID: <20030527024811.U736@small.pukruppa.de>
References: <1053712093.313.39.camel@gyros>
	<1053727046.1868.7.camel@sisko.webonaut.com>
	<1053728774.966.0.camel@gyros>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: FreeBSD GNOME Users <gnome@freebsd.org>
Subject: Re: HEADS UP TESTERS: New marcusmerge script
X-BeenThere: freebsd-gnome@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: GNOME for FreeBSD -- porting and maintaining
	<freebsd-gnome.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gnome>
List-Post: <mailto:freebsd-gnome@freebsd.org>
List-Help: <mailto:freebsd-gnome-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gnome>,
	<mailto:freebsd-gnome-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 27 May 2003 01:03:00 -0000

>
> Definitely!  I just committed it.  Everyone, be sure to download the
> updated version.  Thanks!
>
> Joe
Hmm (?!),

usually I cvsup -CURRENT to src-all and ports-all - all in one
supfile.
Then, when I have got some time left (p.ex. yesterday), I do a marcusmerge -
which seems to work fine.

But I think I didn't get the point, how to integrate both
processes. I left the
SUPFILE=
line blank.
Could you please re-explain slowly?

Thanks,

Uli.


+-----------------------------------+
|        Peter Ulrich Kruppa        |
|          -  Wuppertal -           |
|              Germany              |
+-----------------------------------+