From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 20 05:13:30 2015 Received: (at submit) by debbugs.gnu.org; 20 Mar 2015 09:13:30 +0000 Received: from localhost ([127.0.0.1]:58824 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YYszh-0006sn-Cd for submit@debbugs.gnu.org; Fri, 20 Mar 2015 05:13:29 -0400 Received: from eggs.gnu.org ([208.118.235.92]:54490) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YYszf-0006sa-AM for submit@debbugs.gnu.org; Fri, 20 Mar 2015 05:13:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYszY-0007td-AY for submit@debbugs.gnu.org; Fri, 20 Mar 2015 05:13:22 -0400 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]:58691) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYszY-0007tT-6z for submit@debbugs.gnu.org; Fri, 20 Mar 2015 05:13:20 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56189) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYszW-0006ZH-Tn for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 05:13:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYszV-0007sr-J0 for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 05:13:18 -0400 Received: from fencepost.gnu.org ([2001:4830:134:3::e]:52606) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYszV-0007sn-Fq for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 05:13:17 -0400 Received: from localhost ([127.0.0.1]:59780 helo=lola) by fencepost.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYszV-0008Ua-1V for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 05:13:17 -0400 Received: by lola (Postfix, from userid 1000) id 1A913E0DD6; Fri, 20 Mar 2015 10:13:07 +0100 (CET) From: David Kastrup To: bug-gnu-emacs@gnu.org Subject: 25.0.50; Smerge does "git add" for every final conflict resolution Date: Fri, 20 Mar 2015 10:13:07 +0100 Message-ID: <87iodwc9r0.fsf@fencepost.gnu.org> MIME-Version: 1.0 Content-Type: text/plain X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). 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 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 Smerge-mode has fixed the final conflict in a Git conflict, it adds the file to the index. However, when the conflict occured as the result of "git stash pop" action in the work directory, the state of the index should not be touched: the whole point of using git stash is to store work directory and index separately and restore them separately. So probably Smerge-mode would have to check whether a conflict is recorded in the index before overwriting it. In GNU Emacs 25.0.50.1 (i686-pc-linux-gnu, GTK+ Version 3.12.2) of 2015-03-04 on lola Repository revision: ca2b0e220ee6b2cab538e84703559696ce477e71 Windowing system distributor `The X.Org Foundation', version 11.0.11600000 System Description: Ubuntu 14.10 Configured using: `configure --without-toolkit-scroll-bars' Configured features: XPM JPEG TIFF GIF PNG RSVG IMAGEMAGICK SOUND GPM DBUS GCONF GSETTINGS NOTIFY LIBSELINUX GNUTLS LIBXML2 FREETYPE M17N_FLT LIBOTF XFT ZLIB Important settings: value of $LC_MONETARY: en_US.UTF-8 value of $LC_NUMERIC: en_US.UTF-8 value of $LC_TIME: en_US.UTF-8 value of $LANG: en_US.UTF-8 value of $XMODIFIERS: @im=ibus locale-coding-system: utf-8-unix Major mode: Emacs-Lisp Minor modes in effect: whitespace-mode: t shell-dirtrack-mode: t TeX-PDF-mode: t diff-auto-refine-mode: t desktop-save-mode: t minibuffer-electric-default-mode: t tooltip-mode: t global-eldoc-mode: t electric-indent-mode: t mouse-wheel-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 Recent messages: smerge-next is on , C-c ^ n Entering debugger... Continuing. smerge-ensure-match: No `base' Saving file /home/dak/lilymidi/lily-midi.el... Wrote /home/dak/lilymidi/lily-midi.el Whitespace mode enabled in current buffer You can run the command `whitespace-mode' with M-x whit-m RET Whitespace mode enabled in current buffer scroll-down-command: Beginning of buffer scroll-up-command: End of buffer Load-path shadows: None found. Features: (shadow emacsbug whitespace lily-midi midi-kbd pcmpl-unix pcmpl-gnu pp ccl shell pcomplete warnings misearch multi-isearch dabbrev gnus-dup apropos eieio-opt speedbar sb-image ezimage dframe find-func sendmail nnir debug gnus-kill shr-color color mule-util flow-fill sort smiley gnus-cite mm-archive mail-extr gnus-async gnus-bcklg qp gnus-ml disp-table pop3 nndir nndraft nnmh help-mode gnutls network-stream nsm starttls nnml nnfolder nnnil gnus-agent gnus-srvr gnus-score score-mode nnvirtual gnus-msg gnus-art mm-uu mml2015 mm-view mml-smime smime dig nntp gnus-cache gnus-sum gnus-group gnus-undo gnus-start gnus-cloud nnimap nnmail mail-source tls utf7 netrc nnoo parse-time gnus-spec gnus-int gnus-range message rfc822 mml mml-sec mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045 ietf-drums mailabbrev gmm-utils mailheader gnus-win eww mm-url url-queue url url-proxy url-privacy url-expand url-methods url-history url-cookie url-domsuf url-util url-parse auth-source cl-macs eieio gv eieio-core cl-generic password-cache url-vars mailcap shr dom subr-x pcase browse-url format-spec sh-script smie executable make-mode smerge-mode nxml-uchnm rng-xsd xsd-regexp rng-cmpct rng-nxml rng-valid rng-loc rng-uri rng-parse nxml-parse rng-match rng-dt rng-util rng-pttrn nxml-ns nxml-mode nxml-outln nxml-rap nxml-util nxml-glyph nxml-enc xmltok dired-x dired python json autorevert filenotify bug-reference add-log latexenc tex-info texinfo preview prv-emacs reftex-dcr reftex-auc reftex reftex-vars tex-bar tex-buf toolbar-x noutline outline font-latex byte-opt bytecomp byte-compile cl-extra seq cconv latex edmacro kmacro tex-style tex dbus xml crm lilypond-mode compile comint ansi-color ring jka-compr scheme vc vc-dispatcher vc-git diff-mode easy-mmode cc-mode cc-fonts cc-guess cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs info easymenu package epg-config advice desktop frameset minibuf-eldef gnus gnus-ems nnheader gnus-util mail-utils mm-util help-fns mail-prsvr wid-edit cl-loaddefs cl-lib cus-start cus-load preview-latex tex-site auto-loads server time-date tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type mwheel x-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list newcomment elisp-mode 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 cl-preloaded 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 dbusbind gfilenotify dynamic-setting system-font-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty emacs) Memory information: ((conses 8 696689 124897) (symbols 24 55713 157) (miscs 20 1205 2247) (strings 16 119776 17186) (string-bytes 1 3828540) (vectors 8 48240) (vector-slots 4 1789635 56924) (floats 8 541 993) (intervals 28 35923 854) (buffers 520 295) (heap 1024 71211 19354)) -- David Kastrup From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 20 10:29:20 2015 Received: (at 20151) by debbugs.gnu.org; 20 Mar 2015 14:29:20 +0000 Received: from localhost ([127.0.0.1]:59219 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YYxvL-0007MT-SX for submit@debbugs.gnu.org; Fri, 20 Mar 2015 10:29:20 -0400 Received: from chene.dit.umontreal.ca ([132.204.246.20]:57193) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1YYxvK-0007ML-AJ for 20151@debbugs.gnu.org; Fri, 20 Mar 2015 10:29:18 -0400 Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id t2KETHTf024533; Fri, 20 Mar 2015 10:29:17 -0400 Received: by pastel.home (Postfix, from userid 20848) id 2C194F63; Fri, 20 Mar 2015 10:29:17 -0400 (EDT) From: Stefan Monnier To: David Kastrup Subject: Re: bug#20151: 25.0.50; Smerge does "git add" for every final conflict resolution Message-ID: References: <87iodwc9r0.fsf@fencepost.gnu.org> Date: Fri, 20 Mar 2015 10:29:17 -0400 In-Reply-To: <87iodwc9r0.fsf@fencepost.gnu.org> (David Kastrup's message of "Fri, 20 Mar 2015 10:13:07 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5251=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5251> : inlines <2452> : streams <1408630> : uri <1885574> X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: 20151 Cc: 20151@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: -1.3 (-) > However, when the conflict occured as the result of "git stash pop" > action in the work directory, the state of the index should not be > touched: the whole point of using git stash is to store work directory > and index separately and restore them separately. So probably > Smerge-mode would have to check whether a conflict is recorded in the > index before overwriting it. Sounds right. Patch welcome, Stefan From debbugs-submit-bounces@debbugs.gnu.org Fri Apr 10 11:26:22 2015 Received: (at control) by debbugs.gnu.org; 10 Apr 2015 15:26:22 +0000 Received: from localhost ([127.0.0.1]:52540 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Ygap3-0001lv-Oe for submit@debbugs.gnu.org; Fri, 10 Apr 2015 11:26:21 -0400 Received: from fencepost.gnu.org ([208.118.235.10]:36499 ident=Debian-exim) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Ygap2-0001lo-9u for control@debbugs.gnu.org; Fri, 10 Apr 2015 11:26:20 -0400 Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Ygap1-0006Sj-PS for control@debbugs.gnu.org; Fri, 10 Apr 2015 11:26:19 -0400 Date: Fri, 10 Apr 2015 11:26:19 -0400 Message-Id: Subject: control message for bug 20292 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 (-----) merge 20151 20292 From unknown Mon Jun 23 18:27:33 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: Did not alter fixed versions and reopened. Date: Tue, 12 May 2015 23:15:04 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # Did not alter fixed versions and reopened. thanks # This fakemail brought to you by your local debbugs # administrator From unknown Mon Jun 23 18:27:33 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sun, 14 Jun 2015 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Oct 27 13:44:29 2016 Received: (at control) by debbugs.gnu.org; 27 Oct 2016 17:44:29 +0000 Received: from localhost ([127.0.0.1]:32799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bzoj7-0001ih-6S for submit@debbugs.gnu.org; Thu, 27 Oct 2016 13:44:29 -0400 Received: from mail-qk0-f179.google.com ([209.85.220.179]:32983) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bzoFg-0000yF-43 for control@debbugs.gnu.org; Thu, 27 Oct 2016 13:14:04 -0400 Received: by mail-qk0-f179.google.com with SMTP id v138so159556qka.0 for ; Thu, 27 Oct 2016 10:14:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:from:date:message-id:subject:to; bh=1O9CbS15ekFLXoKPRpaUxZWjncZ39NA1OM45VDFBFkQ=; b=ysS45ywikiTJ+YM5j8RhyXFEmG94FE4eAzPT34Dn0Lfh/nF0Cx1ocMywY0qaKucpSq egJZfOJ9ul8RISYm8zSZRnM1Da/WXC7g1R9G76YlBCVCrOgXKP1j1gLKvFcWcd6vpisA VLcR7yQdqYRhCFI2RSvGZJyRQxcH14fB1N/fkboMdAENBtwfNuuvaMaz5mz8mOnbg0qH OOL+9Y0OPkyzeawX2CtjkEek4chFOKTrg8plbnJWx/Gzd9kWPjChmjqHUlTWFm3RKg7O 0zV3slODZcAOFG1MX11a0TNh5ySuebj/MItys8mJec/OmxoPjTV+qKDkVtybjo0VMUed qZAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=1O9CbS15ekFLXoKPRpaUxZWjncZ39NA1OM45VDFBFkQ=; b=VRYghkqByKlND3QPhN+eTmHSwW/WImQFrsJp3yLOq6r/m+zFTPaZEfYDw7/dnWb/M/ W0rhL41xC5yng5gkOajbp5D+nKoBNXDZwkOdIljEohvQ2h+BO0ZBluiOqJvONgE/40e4 SbJQ84erLZnBwQNV8xlMXfjrmRF7y+JsvK1NPrb+RCGt/DxZjwcRfHWmpeWEFdiSzl/D obZ/M4+AVfEKghn1W5SdGM8u3d9BYBfCmRezTU+luPCeOd3wpt5vcTdW+v2BVIjkOgtI Fw34fBSVEdEYTWgiFPKMhLece0rGygI0+Fe2bmreeQd8s2eTn+tU3zAC6ohQN2JKdXSv jRQQ== X-Gm-Message-State: ABUngvcTpu3mG7UC4I7ZqhookQUdadRi4mTyO0DvHzLWnWlQfqglsszecy79AwFdvE8Q7pc0L0feeEXYvue9HA== X-Received: by 10.55.154.200 with SMTP id c191mr6950659qke.117.1477588438130; Thu, 27 Oct 2016 10:13:58 -0700 (PDT) MIME-Version: 1.0 Received: by 10.55.22.203 with HTTP; Thu, 27 Oct 2016 10:13:37 -0700 (PDT) From: Junio C Hamano Date: Thu, 27 Oct 2016 10:13:37 -0700 X-Google-Sender-Auth: XHZk-mvTVHDsdL5C_ve9VfoowtY Message-ID: Subject: unarchive 20292 To: control@debbugs.gnu.org Content-Type: text/plain; charset=UTF-8 X-Spam-Score: 0.2 (/) X-Debbugs-Envelope-To: control X-Mailman-Approved-At: Thu, 27 Oct 2016 13:44:27 -0400 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.2 (/) unarchive 20292 From unknown Mon Jun 23 18:27:33 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Fri, 16 Dec 2016 12:24:04 +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