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 10:53: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 1200940268 27215 80.91.229.12 (21 Jan 2008 18:31:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 21 Jan 2008 18:31:08 +0000 (UTC) Cc: jaalto@cante.net, Dan Nicolaescu , emacs-devel@gnu.org, rms@gnu.org, Jari Aalto To: Miles Bader Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 21 19:31:26 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 1JH1QY-0005bR-Dx for ged-emacs-devel@m.gmane.org; Mon, 21 Jan 2008 19:31:22 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JH1Q8-0005Hc-RI for ged-emacs-devel@m.gmane.org; Mon, 21 Jan 2008 13:30:56 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JH1Q4-0005HT-TG for emacs-devel@gnu.org; Mon, 21 Jan 2008 13:30:52 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JH1Q2-0005Ey-9M for emacs-devel@gnu.org; Mon, 21 Jan 2008 13:30:51 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JH1Q2-0005Em-5n for emacs-devel@gnu.org; Mon, 21 Jan 2008 13:30:50 -0500 Original-Received: from mx1.redhat.com ([66.187.233.31]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JH1Pv-0001W7-GK; Mon, 21 Jan 2008 13:30:43 -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 m0LITOJA000575; Mon, 21 Jan 2008 13:29:24 -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 m0LITNem002336; Mon, 21 Jan 2008 13:29:23 -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 m0LITNtV002795; Mon, 21 Jan 2008 13:29:23 -0500 Original-Received: by opsy.redhat.com (Postfix, from userid 500) id 8F0EF3781EE; Mon, 21 Jan 2008 10:53:16 -0700 (MST) X-Attribution: Tom In-Reply-To: <87tzl75bcy.fsf@catnip.gol.com> (Miles Bader's message of "Tue\, 22 Jan 2008 02\:37\:01 +0900") 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:87225 Archived-At: >>>>> "Miles" == Miles Bader writes: Miles> Of course part of the problem is that vc-update seems like a hopelessly Miles> antiquated interface -- who wants to do merging on a file-by-file basis?! Yeah... for vc-status I think we will need a new 'update' back end function. Also I think we will need a "conflict" state. Tom