From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: What a modern collaboration toolkit looks like Date: Mon, 21 Jan 2008 15:06:32 -0500 Message-ID: References: <20071230122217.3CA84830B9A@snark.thyrsus.com> <4pd9g15e.fsf@blue.sea.net> <200801211552.m0LFq2Wm012283@sallyv1.ics.uci.edu> <87tzl75bcy.fsf@catnip.gol.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1200946040 16297 80.91.229.12 (21 Jan 2008 20:07:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 21 Jan 2008 20:07:20 +0000 (UTC) Cc: rms@gnu.org, emacs-devel@gnu.org, Dan Nicolaescu , Jari Aalto , jaalto@cante.net, Miles Bader To: Tom Tromey Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 21 21:07:37 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 1JH2vL-0006rr-BZ for ged-emacs-devel@m.gmane.org; Mon, 21 Jan 2008 21:07:15 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JH2uv-0005eS-Ui for ged-emacs-devel@m.gmane.org; Mon, 21 Jan 2008 15:06:49 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JH2us-0005eD-8Y for emacs-devel@gnu.org; Mon, 21 Jan 2008 15:06:46 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JH2uq-0005dj-OP for emacs-devel@gnu.org; Mon, 21 Jan 2008 15:06:45 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JH2uq-0005dc-IP for emacs-devel@gnu.org; Mon, 21 Jan 2008 15:06:44 -0500 Original-Received: from ironport2-out.pppoe.ca ([206.248.154.182]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JH2uj-0005fO-B5; Mon, 21 Jan 2008 15:06:37 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgAAAPuJlEfO+IHadGdsb2JhbACQGgEwmkN+ X-IronPort-AV: E=Sophos;i="4.25,228,1199682000"; d="scan'208";a="13009358" Original-Received: from smtp.pppoe.ca ([65.39.196.238]) by ironport2-out.pppoe.ca with ESMTP; 21 Jan 2008 15:06:33 -0500 Original-Received: from pastel.home ([206.248.129.218]) by smtp.pppoe.ca (Internet Mail Server v1.0) with ESMTP id BVB32833; Mon, 21 Jan 2008 15:06:33 -0500 Original-Received: by pastel.home (Postfix, from userid 20848) id E1E177F8C; Mon, 21 Jan 2008 15:06:32 -0500 (EST) In-Reply-To: (Tom Tromey's message of "Mon, 21 Jan 2008 10:53:16 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.50 (gnu/linux) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. 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:87232 Archived-At: 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 Sounds right. > function. Also I think we will need a "conflict" state. Be careful with this one: some backends allow commits with conflicts (for later resolution). And for many operations, it doesn't matter if a file is locally modified or with a conflict, so in many ways "conflict" is a sub-state of "locally modified". Stefan