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: Another VC terminology change? Date: Fri, 12 Oct 2007 23:36:26 -0400 Message-ID: References: <20071011143005.GA18057@thyrsus.com> <200710120046.l9C0k3Ti018924@oogie-boogie.ics.uci.edu> <200710121523.l9CFNpOG008776@oogie-boogie.ics.uci.edu> <200710121647.l9CGlpLY011358@oogie-boogie.ics.uci.edu> <200710122128.l9CLSC1W022826@oogie-boogie.ics.uci.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1192246612 3078 80.91.229.12 (13 Oct 2007 03:36:52 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Sat, 13 Oct 2007 03:36:52 +0000 (UTC) Cc: esr@thyrsus.com, emacs-devel@gnu.org To: Dan Nicolaescu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Oct 13 05:36:41 2007 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 1IgXns-0000ga-H8 for ged-emacs-devel@m.gmane.org; Sat, 13 Oct 2007 05:36:40 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IgXnl-0005rd-VM for ged-emacs-devel@m.gmane.org; Fri, 12 Oct 2007 23:36:34 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IgXni-0005rY-U7 for emacs-devel@gnu.org; Fri, 12 Oct 2007 23:36:30 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IgXng-0005rM-JR for emacs-devel@gnu.org; Fri, 12 Oct 2007 23:36:29 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IgXng-0005rJ-E2 for emacs-devel@gnu.org; Fri, 12 Oct 2007 23:36:28 -0400 Original-Received: from tomts10.bellnexxia.net ([209.226.175.54] helo=tomts10-srv.bellnexxia.net) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IgXng-0002KU-1R for emacs-devel@gnu.org; Fri, 12 Oct 2007 23:36:28 -0400 Original-Received: from pastel.home ([70.55.141.81]) by tomts10-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20071013033627.WBSO1733.tomts10-srv.bellnexxia.net@pastel.home> for ; Fri, 12 Oct 2007 23:36:27 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 85EED7F7B; Fri, 12 Oct 2007 23:36:26 -0400 (EDT) In-Reply-To: <200710122128.l9CLSC1W022826@oogie-boogie.ics.uci.edu> (Dan Nicolaescu's message of "Fri\, 12 Oct 2007 14\:28\:11 -0700") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/23.0.50 (gnu/linux) X-detected-kernel: by monty-python.gnu.org: Solaris 8 (1) 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:80760 Archived-At: >> >> You mean API rather than UI, right? >> > I mean UI. How does the user request a merge on such a VCS? Using >> > "C-x v +" from any VC managed file? Should it then warn that the >> > whole tree is getting merged? >> >> No: it needs to do it from a place where he can specify the right fileset, >> i.e. from vc-dired (or maybe from just `dired' depending on how this works). > If we go that way, then VC would need a way to know this. It would > need order to issue meaningful error messages when the user tries to > use C-x v + from a buffer managed by a VCS that does not support per > file merging. Why? The user will do C-x v + from the file buffer, which vc.el will pass on to the backend and the backend will signal an error. I see no problem, Stefan