From owner-freebsd-current Sun May 2 2: 9:21 1999 Delivered-To: freebsd-current@freebsd.org Received: from frmug.org (frmug-gw.frmug.org [193.56.58.252]) by hub.freebsd.org (Postfix) with ESMTP id 0F58615A0D for ; Sun, 2 May 1999 02:09:14 -0700 (PDT) (envelope-from roberto@keltia.freenix.fr) Received: (from uucp@localhost) by frmug.org (8.9.1/frmug-2.3/nospam) with UUCP id LAA01166 for freebsd-current@FreeBSD.ORG; Sun, 2 May 1999 11:09:13 +0200 (CEST) (envelope-from roberto@keltia.freenix.fr) Received: by keltia.freenix.fr (Postfix, from userid 101) id 3BAAF8840; Sun, 2 May 1999 11:03:12 +0200 (CEST) (envelope-from roberto) Date: Sun, 2 May 1999 11:03:12 +0200 From: Ollivier Robert To: freebsd-current@FreeBSD.ORG Subject: Perforce (Was: Re: BitKeeper) Message-ID: <19990502110312.A3059@keltia.freenix.fr> Mail-Followup-To: freebsd-current@FreeBSD.ORG References: <19990502015216.A915@keltia.freenix.fr> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii User-Agent: Mutt/0.95.5i In-Reply-To: ; from Matthew Jacob on Sat, May 01, 1999 at 07:32:37PM -0700 X-Operating-System: FreeBSD 4.0-CURRENT/ELF ctm#5244 AMD-K6 MMX @ 200 MHz Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG According to Matthew Jacob: > doesn't have a snappy set of tcl/tk GUI tools that allow you look at whole > branch and revision histories.. They're in the contributed section of the WWW site. The Windows client has a GUI too. > It doesn't have a 3-way filemerge tool (I > still fire up teamware (what NSElite became) to do heavy merging and use > the automerge feature)... It does have both an integrated 3-way merge command and a way to invoke an external one. See "p4 resolve". -- Ollivier ROBERT -=- FreeBSD: The Power to Serve! -=- roberto@keltia.freenix.fr FreeBSD keltia.freenix.fr 4.0-CURRENT #2: Fri Apr 16 22:37:03 CEST 1999 To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message