From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.bugs Subject: bug#20151: 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> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1426842871 21807 80.91.229.3 (20 Mar 2015 09:14:31 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 20 Mar 2015 09:14:31 +0000 (UTC) To: 20151@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Mar 20 10:14:18 2015 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YYt0N-00066D-DF for geb-bug-gnu-emacs@m.gmane.org; Fri, 20 Mar 2015 10:14:11 +0100 Original-Received: from localhost ([::1]:42958 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYt0M-00073x-LD for geb-bug-gnu-emacs@m.gmane.org; Fri, 20 Mar 2015 05:14:10 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56392) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYt0G-0006zi-2a for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 05:14:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YYt0E-00080d-Je for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 05:14:03 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:40815) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YYt0E-00080P-G4 for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 05:14:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1YYt0E-0006ti-6v for bug-gnu-emacs@gnu.org; Fri, 20 Mar 2015 05:14:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: David Kastrup Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 20 Mar 2015 09:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 20151 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.142684281026467 (code B ref -1); Fri, 20 Mar 2015 09:14:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 20 Mar 2015 09:13:30 +0000 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-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 Original-Received: by lola (Postfix, from userid 1000) id 1A913E0DD6; Fri, 20 Mar 2015 10:13:07 +0100 (CET) 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 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: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:100687 Archived-At: 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