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 13:34:40 -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> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1192210910 1499 80.91.229.12 (12 Oct 2007 17:41:50 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 12 Oct 2007 17:41:50 +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 Fri Oct 12 19:41:37 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 1IgOQj-0003Kv-Rr for ged-emacs-devel@m.gmane.org; Fri, 12 Oct 2007 19:36:10 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IgOQd-00055P-Gk for ged-emacs-devel@m.gmane.org; Fri, 12 Oct 2007 13:36:03 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IgOPf-0004bj-Rq for emacs-devel@gnu.org; Fri, 12 Oct 2007 13:35:03 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IgOPd-0004ZN-VX for emacs-devel@gnu.org; Fri, 12 Oct 2007 13:35:03 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IgOPd-0004Z4-HE for emacs-devel@gnu.org; Fri, 12 Oct 2007 13:35:01 -0400 Original-Received: from x-132-204-252-255.xtpr.umontreal.ca ([132.204.252.255] helo=ceviche.home) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IgOPZ-0003WB-8r for emacs-devel@gnu.org; Fri, 12 Oct 2007 13:35:01 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id 6279FB41BB; Fri, 12 Oct 2007 13:34:39 -0400 (EDT) In-Reply-To: <200710121647.l9CGlpLY011358@oogie-boogie.ics.uci.edu> (Dan Nicolaescu's message of "Fri\, 12 Oct 2007 09\:47\:51 -0700") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/23.0.50 (gnu/linux) 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:80734 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). > What happens if there are conflicts in files that are not opened? > Should VC show pop a vc-dired window and show them? The Lisp of possible features is open ended, but if the command was run from a vc-dired buffer, there's nothing special to do, which is a good reason to request that such commands be run from a vc-dired buffer. Stefan