From nelhage@MIT.EDU Sat Jun 13 10:25:52 2009 Received: (at submit) by emacsbugs.donarmstrong.com; 13 Jun 2009 17:25:52 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=0.1 required=4.0 tests=FOURLA autolearn=no version=3.2.5-bugs.debian.org_2005_01_02 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n5DHPi3w016510 for ; Sat, 13 Jun 2009 10:25:46 -0700 Received: from mail.gnu.org ([199.232.76.166]:35680 helo=mx10.gnu.org) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1MFWz5-0006eQ-V2 for emacs-pretest-bug@gnu.org; Sat, 13 Jun 2009 13:25:40 -0400 Received: from biscayne-one-station.mit.edu ([18.7.7.80]:53904) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MFWz5-00083f-NW for emacs-pretest-bug@gnu.org; Sat, 13 Jun 2009 13:25:39 -0400 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by biscayne-one-station.mit.edu (8.13.6/8.9.2) with ESMTP id n5DHPbG8008171; Sat, 13 Jun 2009 13:25:37 -0400 (EDT) Received: from localhost (dhcp-18-111-28-78.dyn.mit.edu [18.111.28.78]) (authenticated bits=0) (User authenticated as nelhage@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id n5DHPaEt009392; Sat, 13 Jun 2009 13:25:37 -0400 (EDT) Date: Sat, 13 Jun 2009 13:25:36 -0400 (EDT) Message-Id: <200906131725.n5DHPaEt009392@outgoing.mit.edu> From: Nelson Elhage To: emacs-pretest-bug@gnu.org Subject: 23.0.60; smerge-mode: Remove trailing space in `smerge-base-re' X-Scanned-By: MIMEDefang 2.42 X-detected-operating-system: by monty-python.gnu.org: Solaris 9 With merge.conflictstyle=diff3, 'git' generates diff3-style conflict markers, with mine/base/other sections, but for the 'base' marker, it only outputs "|||||||\n", with no comment after it. This causes smerge to miss the base marker, since smerge assumes a comment, and defines: (defconst smerge-base-re "^||||||| .*\n") Simply replacing that with (defconst smerge-base-re "^|||||||.*\n") Should allow smerge-mode to handle git conflicts, and I can't imagine it should cause any false-positives otherwise. - Nelson Elhage In GNU Emacs 23.0.60.1 (i686-pc-linux-gnu, GTK+ Version 2.14.4) of 2009-01-21 on phanatique Windowing system distributor `The X.Org Foundation', version 11.0.10600000 Important settings: value of $LC_ALL: nil value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: en_US.UTF-8 value of $XMODIFIERS: nil locale-coding-system: utf-8-unix default-enable-multibyte-characters: t Major mode: Emacs-Lisp Minor modes in effect: diff-auto-refine-mode: t iswitchb-mode: t shell-dirtrack-mode: t display-battery-mode: t display-time-mode: t window-number-mode: t tooltip-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t global-auto-composition-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t column-number-mode: t line-number-mode: t Recent input: C-x C-s C-c 1 C-n M-n C-n C-n C-n M-x d i f f SPC t e l M-p H s C-c C-a C-c 2 C-x C-s C-x V s y d y g m m m a y g C-x b * b M-r c o n C-x C-c C-x V s y e s M-x s m e m o e m o M-< C-c M-x M-p M-x M-p C-c ^ n C-/ C-n C-n C-n C-n M-f C-p C-f C-f C-b C-x 4 b s m e C-x 4 b s c ( s e t q SPC s m e r g e - b a s e - r e SPC C-x b C-x b " " C-b C-c 1 C-b C-b C-b C-b C-b C-b C-b C-b C-b C-b C-b C-b C-b C-b C-b C-b C-SPC C-M-f M-w C-x o C-d C-y C-b C-b C-b C-b C-b C-b C-d C-e C-j C-x b M-x C-g M-< M-x s m e m o M-x M-p C-c ^ b C-c ^ n M-x r e p o r t e s e m e r g e SPC m o d e SPC - - SPC r e m o v e SPC t t r r a i l i n g SPC ' SPC ' SPC i n SPC s m e r g C-g C-c 1 M-< C-x C-x C-c 2 M-x M-p M-p C-x k C-c 1 C-x b M-x r e p o r Recent messages: Smerge mode enabled Undo! Mark set [2 times] Quit Mark set Smerge mode disabled Smerge mode enabled smerge-match-conflict: Point not in conflict region Quit Mark set From monnier@iro.umontreal.ca Fri Jun 26 17:26:50 2009 Received: (at 3553) by emacsbugs.donarmstrong.com; 27 Jun 2009 00:26:50 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-2.9 required=4.0 tests=AWL,HAS_BUG_NUMBER autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from smtp-02.vtx.ch (smtp-02.vtx.ch [212.147.0.114]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n5R0QkPd003468 for <3553@emacsbugs.donarmstrong.com>; Fri, 26 Jun 2009 17:26:47 -0700 Received: from alfajor.home (dyn.83-228-218-202.dsl.vtx.ch [83.228.218.202]) by smtp-02.vtx.ch (VTX Services SA) with ESMTP id 436F15FBBD; Sat, 27 Jun 2009 02:26:45 +0200 (CEST) Received: by alfajor.home (Postfix, from userid 20848) id 0AFC264341; Sat, 27 Jun 2009 02:26:44 +0200 (CEST) From: Stefan Monnier To: Nelson Elhage Cc: 3553@debbugs.gnu.org Subject: Re: bug#3553: 23.0.60; smerge-mode: Remove trailing space in `smerge-base-re' Message-ID: References: <200906131725.n5DHPaEt009392@outgoing.mit.edu> Date: Sat, 27 Jun 2009 02:26:44 +0200 In-Reply-To: <200906131725.n5DHPaEt009392@outgoing.mit.edu> (Nelson Elhage's message of "Sat, 13 Jun 2009 13:25:36 -0400 (EDT)") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.94 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii > With merge.conflictstyle=diff3, 'git' generates diff3-style conflict > markers, with mine/base/other sections, but for the 'base' marker, it > only outputs "|||||||\n", with no comment after it. This causes smerge > to miss the base marker, since smerge assumes a comment, and defines: > (defconst smerge-base-re "^||||||| .*\n") > Simply replacing that with > (defconst smerge-base-re "^|||||||.*\n") > Should allow smerge-mode to handle git conflicts, and I can't imagine > it should cause any false-positives otherwise. I'd rather fix Git so it uses the standard format. Stefan From rgm@gnu.org Tue Jun 30 17:52:51 2009 Received: (at control) by emacsbugs.donarmstrong.com; 1 Jul 2009 00:52:51 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-4.7 required=4.0 tests=AWL,ONEWORD,VALID_BTS_CONTROL autolearn=no version=3.2.5-bugs.debian.org_2005_01_02 Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n610qlAI000636 for ; Tue, 30 Jun 2009 17:52:48 -0700 Received: from rgm by fencepost.gnu.org with local (Exim 4.67) (envelope-from ) id 1MLo46-0002i1-R7; Tue, 30 Jun 2009 20:52:46 -0400 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Message-ID: <19018.45918.773933.187342@fencepost.gnu.org> Date: Tue, 30 Jun 2009 20:52:46 -0400 From: Glenn Morris To: control Subject: control reassign 3727 emacs,ns merge 3588 3727 reassign 3714 emacs,ns reassign 3708 emacs,ns tags 3553 wontfix reassign 3663 emacs,ns reassign 3650 emacs,w32 From debbugs-submit-bounces@debbugs.gnu.org Tue Dec 29 08:18:59 2015 Received: (at control) by debbugs.gnu.org; 29 Dec 2015 13:18:59 +0000 Received: from localhost ([127.0.0.1]:47401 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aDuB1-0006iA-Co for submit@debbugs.gnu.org; Tue, 29 Dec 2015 08:18:59 -0500 Received: from hermes.netfonds.no ([80.91.224.195]:40417) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aDuAz-0006hu-EX for control@debbugs.gnu.org; Tue, 29 Dec 2015 08:18:57 -0500 Received: from 2.150.58.24.tmi.telenormobil.no ([2.150.58.24] helo=mouse) by hermes.netfonds.no with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1aDuAf-00051j-2X for control@debbugs.gnu.org; Tue, 29 Dec 2015 14:18:37 +0100 Date: Tue, 29 Dec 2015 14:18:36 +0100 Message-Id: <87lh8dieab.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #3553 X-MailScanner-ID: 1aDuAf-00051j-2X X-Netfonds-MailScanner: Found to be clean X-Netfonds-MailScanner-From: larsi@gnus.org MailScanner-NULL-Check: 1451999917.31757@1LmOVoczpr1q1J8rWsB2Ug X-Spam-Status: No X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.7 (/) close 3553 From unknown Mon Jun 23 13:09:09 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 27 Jan 2016 12:24:03 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator