Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 2 May 1999 11:03:12 +0200
From:      Ollivier Robert <roberto@keltia.freenix.fr>
To:        freebsd-current@FreeBSD.ORG
Subject:   Perforce (Was: Re: BitKeeper)
Message-ID:  <19990502110312.A3059@keltia.freenix.fr>
In-Reply-To: <Pine.LNX.4.04.9905011928550.735-100000@feral.com>; from Matthew Jacob on Sat, May 01, 1999 at 07:32:37PM -0700
References:  <19990502015216.A915@keltia.freenix.fr> <Pine.LNX.4.04.9905011928550.735-100000@feral.com>

next in thread | previous in thread | raw e-mail | index | archive | help
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




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19990502110312.A3059>