From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Tom Tromey Newsgroups: gmane.emacs.devel Subject: Re: What a modern collaboration toolkit looks like Date: Mon, 21 Jan 2008 12:50:16 -0700 Message-ID: References: <20071230122217.3CA84830B9A@snark.thyrsus.com> <4pd9g15e.fsf@blue.sea.net> <200801211552.m0LFq2Wm012283@sallyv1.ics.uci.edu> <87tzl75bcy.fsf@catnip.gol.com> Reply-To: Tom Tromey NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1200947249 21140 80.91.229.12 (21 Jan 2008 20:27:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 21 Jan 2008 20:27:29 +0000 (UTC) Cc: rms@gnu.org, emacs-devel@gnu.org, Dan Nicolaescu , Jari Aalto , jaalto@cante.net, Miles Bader To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 21 21:27:47 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1JH3F9-0006DI-G6 for ged-emacs-devel@m.gmane.org; Mon, 21 Jan 2008 21:27:43 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JH3Ej-0006DQ-SC for ged-emacs-devel@m.gmane.org; Mon, 21 Jan 2008 15:27:17 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JH3E9-0005st-94 for emacs-devel@gnu.org; Mon, 21 Jan 2008 15:26:41 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JH3E7-0005s5-EL for emacs-devel@gnu.org; Mon, 21 Jan 2008 15:26:40 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JH3E7-0005s2-7o for emacs-devel@gnu.org; Mon, 21 Jan 2008 15:26:39 -0500 Original-Received: from mx1.redhat.com ([66.187.233.31]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JH3Dz-0003Rx-Qg; Mon, 21 Jan 2008 15:26:31 -0500 Original-Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id m0LKQPoE019259; Mon, 21 Jan 2008 15:26:25 -0500 Original-Received: from pobox.corp.redhat.com (pobox.corp.redhat.com [10.11.255.20]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m0LKQPLA026721; Mon, 21 Jan 2008 15:26:25 -0500 Original-Received: from opsy.redhat.com (ton.yyz.redhat.com [10.15.16.15]) by pobox.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m0LKQObl006533; Mon, 21 Jan 2008 15:26:24 -0500 Original-Received: by opsy.redhat.com (Postfix, from userid 500) id 587E83781EE; Mon, 21 Jan 2008 12:50:16 -0700 (MST) X-Attribution: Tom In-Reply-To: (Stefan Monnier's message of "Mon\, 21 Jan 2008 15\:06\:32 -0500") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.0.990 (gnu/linux) X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:87238 Archived-At: >>>>> "Stefan" == Stefan Monnier writes: >> function. Also I think we will need a "conflict" state. Stefan> Be careful with this one: some backends allow commits with conflicts Stefan> (for later resolution). And for many operations, it doesn't matter if Stefan> a file is locally modified or with a conflict, so in many ways Stefan> "conflict" is a sub-state of "locally modified". Thanks. FWIW I didn't have any clue what particular semantics "conflict" should imply. I just think that, like pcl-cvs, it is useful to show this as a separate state in a vc-status buffer. Tom