From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 09 09:46:29 2015 Received: (at submit) by debbugs.gnu.org; 9 Jan 2015 14:46:29 +0000 Received: from localhost ([127.0.0.1]:40837 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y9apY-0003Ee-K4 for submit@debbugs.gnu.org; Fri, 09 Jan 2015 09:46:29 -0500 Received: from eggs.gnu.org ([208.118.235.92]:55912) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y9apV-0003EV-Jn for submit@debbugs.gnu.org; Fri, 09 Jan 2015 09:46:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y9apU-0006dZ-CQ for submit@debbugs.gnu.org; Fri, 09 Jan 2015 09:46:25 -0500 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org X-Spam-Level: X-Spam-Status: No, score=0.8 required=5.0 tests=BAYES_50,T_RP_MATCHES_RCVD autolearn=disabled version=3.3.2 Received: from lists.gnu.org ([2001:4830:134:3::11]:50541) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9apU-0006dS-9W for submit@debbugs.gnu.org; Fri, 09 Jan 2015 09:46:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9apS-0002cv-UO for bug-gnu-emacs@gnu.org; Fri, 09 Jan 2015 09:46:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y9apM-0006cm-GS for bug-gnu-emacs@gnu.org; Fri, 09 Jan 2015 09:46:22 -0500 Received: from mtaout24.012.net.il ([80.179.55.180]:36547) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y9apM-0006ci-2r for bug-gnu-emacs@gnu.org; Fri, 09 Jan 2015 09:46:16 -0500 Received: from conversion-daemon.mtaout24.012.net.il by mtaout24.012.net.il (HyperSendmail v2007.08) id <0NHW00000YY8O900@mtaout24.012.net.il> for bug-gnu-emacs@gnu.org; Fri, 09 Jan 2015 16:38:14 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout24.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NHW00M7JZBQHC40@mtaout24.012.net.il> for bug-gnu-emacs@gnu.org; Fri, 09 Jan 2015 16:38:14 +0200 (IST) Date: Fri, 09 Jan 2015 16:46:32 +0200 From: Eli Zaretskii Subject: 24.4.51; VC doesn't support SMerge mode with Git back-end X-012-Sender: halo1@inter.net.il To: bug-gnu-emacs@gnu.org Message-id: <834ms057w7.fsf@gnu.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:4830:134:3::11 X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii 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: -5.0 (-----) When there's a merge conflict in a Bazaar repository, visiting a file with conflict markers turns on SMerge mode automatically, and saving the file after resolving the conflict automatically runs the bzr command necessary to tell bzr the conflicts were resolved. This doesn't happen in a Git repository. I see that the necessary code was added to master, so I guess I'm asking to backport that to the release branch. In GNU Emacs 24.4.51.61 (i686-pc-mingw32) of 2015-01-09 on HOME-C4E4A596F7 Repository revision: 70f298f88e84a5bfce26e3ff758157057a7948f3 Windowing system distributor `Microsoft Corp.', version 5.1.2600 Configured using: `configure --prefix=/d/usr --enable-checking=yes,glyphs 'CFLAGS=-O0 -g3'' Important settings: value of $LANG: ENU locale-coding-system: cp1255 Major mode: Lisp Interaction Minor modes in effect: tooltip-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Recent messages: For information about GNU Emacs and the GNU system, type C-h C-a. Load-path shadows: None found. Features: (shadow sort gnus-util mail-extr emacsbug message format-spec rfc822 mml easymenu mml-sec mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util help-fns mail-prsvr mail-utils time-date tooltip electric uniquify ediff-hook vc-hooks lisp-float-type mwheel dos-w32 ls-lisp w32-common-fns disp-table w32-win w32-vars tool-bar dnd fontset image regexp-opt fringe tabulated-list newcomment lisp-mode prog-mode register page menu-bar rfn-eshadow timer select scroll-bar mouse jit-lock font-lock syntax facemenu font-core frame cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese case-table epa-hook jka-cmpr-hook help simple abbrev minibuffer nadvice loaddefs button faces cus-face macroexp files text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote make-network-process w32notify w32 multi-tty emacs) Memory information: ((conses 8 74330 7931) (symbols 32 17527 0) (miscs 32 33 128) (strings 16 10811 3931) (string-bytes 1 269176) (vectors 8 9548) (vector-slots 4 384727 1936) (floats 8 57 308) (intervals 28 235 28) (buffers 508 11)) From debbugs-submit-bounces@debbugs.gnu.org Fri Jan 09 12:34:49 2015 Received: (at 19545) by debbugs.gnu.org; 9 Jan 2015 17:34:49 +0000 Received: from localhost ([127.0.0.1]:41075 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y9dST-0007OW-2q for submit@debbugs.gnu.org; Fri, 09 Jan 2015 12:34:49 -0500 Received: from fencepost.gnu.org ([208.118.235.10]:52570) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Y9dSR-0007OO-AL for 19545@debbugs.gnu.org; Fri, 09 Jan 2015 12:34:47 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Y9dSN-00008x-1s; Fri, 09 Jan 2015 12:34:43 -0500 From: Glenn Morris To: Eli Zaretskii Subject: Re: bug#19545: 24.4.51; VC doesn't support SMerge mode with Git back-end References: <834ms057w7.fsf@gnu.org> X-Spook: Perl-RSA Vickie Weaver Abu Ghraib eavesdropping Ft. Bragg X-Ran: 8~eT[}"8'R?v;7EKo3?g7GyKF9R-+I\.@#)[PWaK"ltB>O`H}_6F>1")AVo6d+CF}HBzl` X-Hue: black X-Debbugs-No-Ack: yes X-Attribution: GM Date: Fri, 09 Jan 2015 12:34:42 -0500 In-Reply-To: <834ms057w7.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 09 Jan 2015 16:46:32 +0200") Message-ID: User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: 19545 Cc: 19545@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 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: -5.0 (-----) You want to backport http://lists.gnu.org/archive/html/emacs-diffs/2014-08/msg00102.html http://lists.gnu.org/archive/html/emacs-diffs/2014-08/msg00103.html which should be attributed to Rudiger Sonderfeld, apart from vc-git-resolve-when-done. BTW, it would be nice is someone fixed this properly at some point; ref http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01126.html From debbugs-submit-bounces@debbugs.gnu.org Tue Feb 17 14:16:53 2015 Received: (at control) by debbugs.gnu.org; 17 Feb 2015 19:16:53 +0000 Received: from localhost ([127.0.0.1]:46574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YNndc-0002sA-Oe for submit@debbugs.gnu.org; Tue, 17 Feb 2015 14:16:52 -0500 Received: from fencepost.gnu.org ([208.118.235.10]:43625 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YNnda-0002s2-Bk for control@debbugs.gnu.org; Tue, 17 Feb 2015 14:16:50 -0500 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YNnda-0006SN-4M for control@debbugs.gnu.org; Tue, 17 Feb 2015 14:16:50 -0500 Date: Tue, 17 Feb 2015 14:16:50 -0500 Message-Id: Subject: control message for bug 19758 To: X-Mailer: mail (GNU Mailutils 2.1) From: Glenn Morris X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 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: -5.0 (-----) block 19758 by 19545 From debbugs-submit-bounces@debbugs.gnu.org Wed Feb 18 10:51:24 2015 Received: (at control) by debbugs.gnu.org; 18 Feb 2015 15:51:24 +0000 Received: from localhost ([127.0.0.1]:47897 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YO6uK-0008VZ-4i for submit@debbugs.gnu.org; Wed, 18 Feb 2015 10:51:24 -0500 Received: from mtaout25.012.net.il ([80.179.55.181]:39110) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YO6uH-0008VK-8Q for control@debbugs.gnu.org; Wed, 18 Feb 2015 10:51:22 -0500 Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0NJZ009004Y5HZ00@mtaout25.012.net.il> for control@debbugs.gnu.org; Wed, 18 Feb 2015 17:45:55 +0200 (IST) Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NJZ0093Z54J5J10@mtaout25.012.net.il> for control@debbugs.gnu.org; Wed, 18 Feb 2015 17:45:55 +0200 (IST) Date: Wed, 18 Feb 2015 17:51:26 +0200 From: Eli Zaretskii Subject: Unblock X-012-Sender: halo1@inter.net.il To: control@debbugs.gnu.org Message-id: <8361az5ibl.fsf@gnu.org> X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: Eli Zaretskii 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: 1.0 (+) unblock 19758 by 19545 thanks From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 10 11:26:51 2015 Received: (at control) by debbugs.gnu.org; 10 Apr 2015 15:26:51 +0000 Received: from localhost ([127.0.0.1]:52543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YgapX-0001mh-8E for submit@debbugs.gnu.org; Fri, 10 Apr 2015 11:26:51 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:36523 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YgapV-0001ma-VO for control@debbugs.gnu.org; Fri, 10 Apr 2015 11:26:50 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1YgapV-0006bn-Os for control@debbugs.gnu.org; Fri, 10 Apr 2015 11:26:49 -0400 Date: Fri, 10 Apr 2015 11:26:49 -0400 Message-Id: Subject: control message for bug 19545 To: X-Mailer: mail (GNU Mailutils 2.1) From: Glenn Morris X-Spam-Score: -5.0 (-----) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 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: -5.0 (-----) fixed 19545 25.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jun 05 20:10:48 2018 Received: (at 19545) by debbugs.gnu.org; 6 Jun 2018 00:10:48 +0000 Received: from localhost ([127.0.0.1]:35658 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fQM2I-0007oH-AC for submit@debbugs.gnu.org; Tue, 05 Jun 2018 20:10:46 -0400 Received: from mail-io0-f177.google.com ([209.85.223.177]:43332) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1fQM2G-0007nz-LA; Tue, 05 Jun 2018 20:10:45 -0400 Received: by mail-io0-f177.google.com with SMTP id t6-v6so5557200iob.10; Tue, 05 Jun 2018 17:10:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=OWxzUF0r17OQjMOxMuLIrVDu07Pa+c+I9fluQMUM+J4=; b=DLGy/YaA5ljgAhakNvk4dfZ7r0kQ5ufaMn2YXX6Ggb3RFHNXew1UVxIvDn3jzpd7r9 /MrOq2+Slqtk9nMV68b6zx0B+5coLlSH2LrNOyCG5GlLBr2gFzOICoFOdikVbku2brdZ TwCwXOTe0OMipeeGsOmkrV8WsFRwlcQQUOnm+S98p8f1uOVn7Z1Sn88YlIdyj3rCnCZm vEgbr6pUH8CNY1EnEVXJacDTYmR/r8Zb31rXoM3kQeT/2bKVlekUPE9kQIOROK3mLHFJ GU8dRlKULjXCCJkoYjLub/FNYpg1TbatZLD0S+jEV21Kjjv+UuY1/Jes/jL5Tga5YEX1 tUdg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=OWxzUF0r17OQjMOxMuLIrVDu07Pa+c+I9fluQMUM+J4=; b=EVzwD09S/QixX5sNnmiiUjSpLBNkDE9xcpP/sWkTFSSztskntjJdyN926IIohuRLG0 8Nwg+Qr+a4nHA9fjHR8HyN7JRTu775rjyQHNGYw9fnhdl+Xef+bekj2D0BzDqmrrQ5iy zy4zm73Tpz384bBHc3xBNC1hl/69UOWrMUjV1Gs6Alzcl2K5hEjbPHGIqTnPwOUJR5FI pMhaRh4ZjMUzu++ZrAvPMl7i4anE0QG0ONHvwS7s4LHA1fq8rTFGDFNartuw+M4sRf2o D/OuVnxTlHr9Hgzq8FS5zIFYqjL6x0E7xJkB5cSSBbHnugEQnyzCwz3SQyfxys2sQXLz krzQ== X-Gm-Message-State: APt69E2AbKuZ0PJuxtFaKBi8rBsAMBsaJY4QMYtI7eX1UHS4V34T+lVx SCrUnIaq04ir3usSBk78VDPGiUwn X-Google-Smtp-Source: ADUXVKK5DG9Orhn9wzFIZpYBvwoigPTfH3i23FU+G18H4CRs0w/P3NFgO31gs76KnrReBwqwgykOiA== X-Received: by 2002:a6b:994d:: with SMTP id b74-v6mr796315ioe.195.1528243839253; Tue, 05 Jun 2018 17:10:39 -0700 (PDT) Received: from zebian (cbl-45-2-119-34.yyz.frontiernetworks.ca. [45.2.119.34]) by smtp.googlemail.com with ESMTPSA id b128-v6sm1373261itb.3.2018.06.05.17.10.38 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 05 Jun 2018 17:10:38 -0700 (PDT) From: Noam Postavsky To: Eli Zaretskii Subject: Re: bug#19545: 24.4.51; VC doesn't support SMerge mode with Git back-end References: <834ms057w7.fsf@gnu.org> Date: Tue, 05 Jun 2018 20:10:37 -0400 In-Reply-To: <834ms057w7.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 09 Jan 2015 16:46:32 +0200") Message-ID: <87muw86agy.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: 19545 Cc: 19545@debbugs.gnu.org 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: -1.8 (-) close 19545 quit Eli Zaretskii writes: > When there's a merge conflict in a Bazaar repository, visiting a file > with conflict markers turns on SMerge mode automatically, and saving > the file after resolving the conflict automatically runs the bzr > command necessary to tell bzr the conflicts were resolved. > > This doesn't happen in a Git repository. I see that the necessary > code was added to master, so I guess I'm asking to backport that to > the release branch. > > > In GNU Emacs 24.4.51.61 (i686-pc-mingw32) Well, it wasn't backported. Too late now I guess. From unknown Tue Aug 19 21:02:12 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, 04 Jul 2018 11:24:05 +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