From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#7152: vc-update fails under conflicts (bug#4280) Date: Sun, 03 Oct 2010 15:45:53 -0400 Message-ID: References: <5042D337-34A5-4643-8833-29D5C7F82F0D@gmail.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1286136716 20785 80.91.229.12 (3 Oct 2010 20:11:56 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 3 Oct 2010 20:11:56 +0000 (UTC) To: 7152-done@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Oct 03 22:11:54 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1P2UuY-0005Hb-9m for geb-bug-gnu-emacs@m.gmane.org; Sun, 03 Oct 2010 22:11:54 +0200 Original-Received: from localhost ([127.0.0.1]:43192 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P2UuX-0005ec-Kg for geb-bug-gnu-emacs@m.gmane.org; Sun, 03 Oct 2010 16:11:53 -0400 Original-Received: from [140.186.70.92] (port=50728 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1P2UuS-0005dC-Ou for bug-gnu-emacs@gnu.org; Sun, 03 Oct 2010 16:11:49 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1P2UuR-0004TA-Pk for bug-gnu-emacs@gnu.org; Sun, 03 Oct 2010 16:11:48 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:55770) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1P2UuR-0004T6-KU for bug-gnu-emacs@gnu.org; Sun, 03 Oct 2010 16:11:47 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1P2USb-0001OZ-Ts for bug-gnu-emacs@gnu.org; Sun, 03 Oct 2010 15:43:01 -0400 Resent-From: Glenn Morris Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Sun, 03 Oct 2010 19:43:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 7152 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Mail-Followup-To: 7152@debbugs.gnu.org, rgm@gnu.org Original-Received: via spool by 7152-done@debbugs.gnu.org id=D7152.12861349705356 (code D ref 7152); Sun, 03 Oct 2010 19:43:01 +0000 Original-Received: (at 7152-done) by debbugs.gnu.org; 3 Oct 2010 19:42:50 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1P2USQ-0001OL-3s for submit@debbugs.gnu.org; Sun, 03 Oct 2010 15:42:50 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1P2USO-0001OG-Rh for 7152-done@debbugs.gnu.org; Sun, 03 Oct 2010 15:42:49 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1P2UVN-00055z-3N; Sun, 03 Oct 2010 15:45:53 -0400 X-Spook: BRLO Albanian Ermes 9/11 INSCOM Juiliett Class Submarine X-Ran: V2PZ,JB-\JphMCV0DA5Klr^32`u8z (Olof Ohlsson Sax's message of "Sun\, 3 Oct 2010 16\:07\:00 +0200") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list Resent-Date: Sun, 03 Oct 2010 15:43:01 -0400 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:40681 Archived-At: Thanks; applied.