From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.devel Subject: Re: vc-dir with Subversion Date: Fri, 03 Apr 2009 15:21:44 -0400 Message-ID: <87ab6x7dbr.fsf@cyd.mit.edu> References: <18901.49921.885006.143162@totara.tehura.co.nz> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1238786429 24043 80.91.229.12 (3 Apr 2009 19:20:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 3 Apr 2009 19:20:29 +0000 (UTC) Cc: emacs-devel@gnu.org To: nickrob@snap.net.nz (Nick Roberts) Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Apr 03 21:21:47 2009 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 1LpoxV-00009u-Bn for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2009 21:21:45 +0200 Original-Received: from localhost ([127.0.0.1]:48580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lpow7-0005ab-01 for ged-emacs-devel@m.gmane.org; Fri, 03 Apr 2009 15:20:19 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lpow1-0005Xs-Nk for emacs-devel@gnu.org; Fri, 03 Apr 2009 15:20:13 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lpovw-0005SS-6R for emacs-devel@gnu.org; Fri, 03 Apr 2009 15:20:12 -0400 Original-Received: from [199.232.76.173] (port=36635 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lpovw-0005SM-2c for emacs-devel@gnu.org; Fri, 03 Apr 2009 15:20:08 -0400 Original-Received: from cyd.mit.edu ([18.115.2.24]:46118) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Lpovv-0003iv-S7 for emacs-devel@gnu.org; Fri, 03 Apr 2009 15:20:07 -0400 Original-Received: by cyd.mit.edu (Postfix, from userid 1000) id 751C357E245; Fri, 3 Apr 2009 15:21:44 -0400 (EDT) In-Reply-To: <18901.49921.885006.143162@totara.tehura.co.nz> (Nick Roberts's message of "Fri, 3 Apr 2009 21:04:17 +1300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.91 (gnu/linux) X-detected-operating-system: 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:110043 Archived-At: nickrob@snap.net.nz (Nick Roberts) writes: > Using Subversion, vc-dir detects conflicts of two kinds: > > 1) Prior to updating. > 2) After updating. > > but labels the status with the keyword `conflict' in both cases. In the > latter case all other keywords use the past tense: removed, edited, > unregistered etc. To avoid confusion I suggest that we use the keyword > `conflicted' for this case. Is there any practical reason for the user to be able to distinguish between the two states?