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: VC state Date: Mon, 07 Apr 2008 11:16:22 -0400 Message-ID: References: <200804061740.m36Hemw8021394@sallyv1.ics.uci.edu> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1207581819 11156 80.91.229.12 (7 Apr 2008 15:23:39 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 7 Apr 2008 15:23:39 +0000 (UTC) Cc: emacs-devel@gnu.org To: Dan Nicolaescu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 07 17:24:11 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 1JitCO-0000Gh-Nv for ged-emacs-devel@m.gmane.org; Mon, 07 Apr 2008 17:23:57 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JitBl-0006PM-Ee for ged-emacs-devel@m.gmane.org; Mon, 07 Apr 2008 11:23:17 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JitBK-0006E7-DU for emacs-devel@gnu.org; Mon, 07 Apr 2008 11:22:50 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JitBI-0006D4-Qz for emacs-devel@gnu.org; Mon, 07 Apr 2008 11:22:49 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JitBI-0006Cz-FT for emacs-devel@gnu.org; Mon, 07 Apr 2008 11:22:48 -0400 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.182]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JitBI-0000Vf-89 for emacs-devel@gnu.org; Mon, 07 Apr 2008 11:22:48 -0400 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApgFALrY+UdMCpOw/2dsb2JhbACBXKhg X-IronPort-AV: E=Sophos;i="4.25,617,1199682000"; d="scan'208";a="18069267" Original-Received: from smtp.pppoe.ca (HELO smtp.teksavvy.com) ([65.39.196.238]) by ironport2-out.teksavvy.com with ESMTP; 07 Apr 2008 11:22:47 -0400 Original-Received: from ceviche.home ([76.10.147.176]) by smtp.teksavvy.com (Internet Mail Server v1.0) with ESMTP id NTD58447 for ; Mon, 07 Apr 2008 11:22:47 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id E9E5AB46F1; Mon, 7 Apr 2008 11:16:22 -0400 (EDT) In-Reply-To: <200804061740.m36Hemw8021394@sallyv1.ics.uci.edu> (Dan Nicolaescu's message of "Sun, 06 Apr 2008 10:40:48 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (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:94577 Archived-At: >> - there should be a way to operate on (sub)directories. > You mean something more than M-x vc-status DIR/SUBDIR RET ? Yes. There's sometimes an important difference between passing "src/" as the argument vs passing all the files in "src/" that appear in the vc-status (beside the fact that the former does not require you to first mark each one of those files). >> - it should be possible to add an entry in the display (like PCL-CVS's >> `I') so as to then operate on it. > Interesting, didn't know about this feature. I'll implement this. I already mentioned it several times when we were talking about which files should be shown: without `I', any choice other than "all" is occasionally problematic. >> - indicate files with conflicts (probably requires changes in backends >> as well to provide that info). > This has been in Todo for a while, displaying this stuff is trivial, VC > needs just to provide the information. Someone just needs to sit down > and figure out how it's supposed to work in VC... With some backends (E.g. Svn and Bzr), it would make a lot of sense to make it a new vc-state, since you need to run `(svn|bzr) resolve' to switch from that state to `edited' and you can't commit before. In other bakends, it's less clear. Maybe you should try to simply add `conflict' as a new `vc-state' and see how it works out. This will require checking all uses of `vc-state' to adjust them to the new state. Stefan