From owner-freebsd-config  Thu Oct  8 17:33:22 1998
Return-Path: <owner-freebsd-config@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id RAA00190
          for freebsd-config-outgoing; Thu, 8 Oct 1998 17:33:22 -0700 (PDT)
          (envelope-from owner-freebsd-config@FreeBSD.ORG)
Received: from rover.village.org (rover.village.org [204.144.255.49])
          by hub.freebsd.org (8.8.8/8.8.8) with SMTP id RAA00160
          for <config@freebsd.org>; Thu, 8 Oct 1998 17:33:01 -0700 (PDT)
          (envelope-from imp@village.org)
Received: from harmony [10.0.0.6] 
	by rover.village.org with esmtp (Exim 1.71 #1)
	id 0zRQU0-00057F-00; Thu, 8 Oct 1998 18:32:36 -0600
Received: from harmony.village.org (localhost.village.org [127.0.0.1]) by harmony.village.org (8.9.1/8.8.3) with ESMTP id SAA07874; Thu, 8 Oct 1998 18:32:11 -0600 (MDT)
Message-Id: <199810090032.SAA07874@harmony.village.org>
To: "Daniel O'Connor" <doconnor@gsoft.com.au>
Subject: Re: Needed: intelisync-like functionality 
Cc: config@FreeBSD.ORG, Mike Smith <mike@smith.net.au>
In-reply-to: Your message of "Fri, 09 Oct 1998 09:51:43 +0930."
		<XFMail.981009095143.doconnor@gsoft.com.au> 
References: <XFMail.981009095143.doconnor@gsoft.com.au>  
Date: Thu, 08 Oct 1998 18:32:11 -0600
From: Warner Losh <imp@village.org>
Sender: owner-freebsd-config@FreeBSD.ORG
Precedence: bulk

In message <XFMail.981009095143.doconnor@gsoft.com.au> "Daniel O'Connor" writes:
: Well.. what about the way CVS does it?
: It has to deal with this sort of thing.. (ie 2 people changing the same
: piece of source)

That's what I had in mind.  However, with smarter conflict resolution,
since CVS is brain dead about this for things like config files...

Warner

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-config" in the body of the message