From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.devel Subject: changes to vc-update Date: Sun, 13 Jan 2008 12:09:03 -0800 Message-ID: <200801132009.m0DK98uC029365@oogie-boogie.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 1200255056 28232 80.91.229.12 (13 Jan 2008 20:10:56 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 13 Jan 2008 20:10:56 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 13 21:11:17 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 1JE9Am-0001Me-KL for ged-emacs-devel@m.gmane.org; Sun, 13 Jan 2008 21:11:13 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JE9AO-0000RK-EI for ged-emacs-devel@m.gmane.org; Sun, 13 Jan 2008 15:10:48 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1JE9AK-0000RF-Fx for emacs-devel@gnu.org; Sun, 13 Jan 2008 15:10:44 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1JE9AI-0000R3-3l for emacs-devel@gnu.org; Sun, 13 Jan 2008 15:10:43 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1JE9AH-0000R0-TW for emacs-devel@gnu.org; Sun, 13 Jan 2008 15:10:41 -0500 Original-Received: from oogie-boogie.ics.uci.edu ([128.195.1.41]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1JE9AH-0002Ad-FE for emacs-devel@gnu.org; Sun, 13 Jan 2008 15:10:41 -0500 Original-Received: from mothra.ics.uci.edu (mothra.ics.uci.edu [128.195.6.93]) by oogie-boogie.ics.uci.edu (8.13.6/8.13.6) with ESMTP id m0DK98uC029365 for ; Sun, 13 Jan 2008 12:09:13 -0800 (PST) Original-Lines: 18 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=-0.84, required 5, autolearn=disabled, ALL_TRUSTED -1.44, J_CHICKENPOX_31 0.60) X-ICS-MailScanner-From: dann@mothra.ics.uci.edu X-detected-kernel: by monty-python.gnu.org: Solaris 9 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:86847 Archived-At: I just checked in a change to vc-update to make it resolve conflicts in case `merge-news' returned true. (Now doing C-x v + for a file under CVS that has conflicts will turn on smerge-mode). vc-cvs-merge-news seem to have had a bug for ever: in case of a conflict (vc-cvs-command nil 0 file "update") threw an error (because of the "0" arg), so the output of the command was never parsed. So I changed "0" to nil.n Some other commands in vc-cvs.el might have the same issue. IMO these changes are OK, but it be nice if someone else would look over them. Thanks --dan