From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ross Boylan Newsgroups: gmane.emacs.bugs Subject: bug#22860: 24.3; hg merge not too functional Date: Mon, 29 Feb 2016 12:56:21 -0800 Message-ID: <86wppnkzgq.fsf@ross-sas.epi-ucsf.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1456779453 18647 80.91.229.3 (29 Feb 2016 20:57:33 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 29 Feb 2016 20:57:33 +0000 (UTC) To: 22860@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Mon Feb 29 21:57:19 2016 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 1aaUsT-0003wq-JV for geb-bug-gnu-emacs@m.gmane.org; Mon, 29 Feb 2016 21:57:13 +0100 Original-Received: from localhost ([::1]:39109 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaUsT-0004fR-0n for geb-bug-gnu-emacs@m.gmane.org; Mon, 29 Feb 2016 15:57:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36370) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaUsO-0004f1-8Q for bug-gnu-emacs@gnu.org; Mon, 29 Feb 2016 15:57:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaUsJ-0002iV-2L for bug-gnu-emacs@gnu.org; Mon, 29 Feb 2016 15:57:08 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:57030) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaUsI-0002iN-Vq for bug-gnu-emacs@gnu.org; Mon, 29 Feb 2016 15:57:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aaUsI-0008AB-Oe for bug-gnu-emacs@gnu.org; Mon, 29 Feb 2016 15:57:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Ross Boylan Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 29 Feb 2016 20:57:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 22860 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: Original-Received: via spool by submit@debbugs.gnu.org id=B.145677942231372 (code B ref -1); Mon, 29 Feb 2016 20:57:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 29 Feb 2016 20:57:02 +0000 Original-Received: from localhost ([127.0.0.1]:54157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aaUsH-00089s-Ez for submit@debbugs.gnu.org; Mon, 29 Feb 2016 15:57:01 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:45267) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aaUsD-00089H-Su for submit@debbugs.gnu.org; Mon, 29 Feb 2016 15:56:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaUs7-0002dk-DP for submit@debbugs.gnu.org; Mon, 29 Feb 2016 15:56:52 -0500 Original-Received: from lists.gnu.org ([2001:4830:134:3::11]:48483) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaUs7-0002bt-9w for submit@debbugs.gnu.org; Mon, 29 Feb 2016 15:56:51 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36224) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaUs4-0004ay-QB for bug-gnu-emacs@gnu.org; Mon, 29 Feb 2016 15:56:50 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aaUrv-0002Zl-MC for bug-gnu-emacs@gnu.org; Mon, 29 Feb 2016 15:56:48 -0500 Original-Received: from esa2.ucsf.iphmx.com ([68.232.143.34]:5255) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aaUrv-0002ZX-C6 for bug-gnu-emacs@gnu.org; Mon, 29 Feb 2016 15:56:39 -0500 Original-Received: from mcbmobwap002.ucsfmedicalcenter.org ([64.54.35.146]) by esa2.ucsf.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 29 Feb 2016 12:56:38 -0800 X-AuditID: 40362392-f795c6d000005f23-93-56d4b084c0ff Original-Received: from bcuda3.ucsf.edu (otp005580ots.ucsfmedicalcenter.org [64.54.36.202]) by mcbmobwap002.ucsfmedicalcenter.org (Symantec Mail Security) with SMTP id BA.9D.24355.480B4D65; Mon, 29 Feb 2016 12:56:36 -0800 (PST) X-ASG-Debug-ID: 1456779395-0a655e456358ff90002-HqB3X1 Original-Received: from exht04.net.ucsf.edu (mx.ucsf.edu [64.54.247.193]) by bcuda3.ucsf.edu with ESMTP id nUQiVQ9wSBBPhomh (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 29 Feb 2016 12:56:35 -0800 (PST) X-Barracuda-Envelope-From: Ross.Boylan@ucsf.edu X-Barracuda-Effective-Source-IP: mx.ucsf.edu[64.54.247.193] X-Barracuda-Apparent-Source-IP: 64.54.247.193 Original-Received: from ross-sas (64.54.171.2) by exht04.net.ucsf.edu (64.54.247.221) with Microsoft SMTP Server id 14.3.224.2; Mon, 29 Feb 2016 12:56:35 -0800 Original-Received: from ross by ross-sas with local (Exim 4.82) (envelope-from ) id 1aaUrd-000E9G-9f for bug-gnu-emacs@gnu.org; Mon, 29 Feb 2016 12:56:21 -0800 X-ASG-Orig-Subj: 24.3; hg merge not too functional X-Barracuda-Connect: mx.ucsf.edu[64.54.247.193] X-Barracuda-Start-Time: 1456779395 X-Barracuda-Encrypted: ECDHE-RSA-AES256-SHA X-Barracuda-URL: https://bcuda3.ucsf.edu:443/cgi-mod/mark.cgi X-Barracuda-Scan-Msg-Size: 5304 X-Virus-Scanned: by bsmtpd at ucsf.edu X-Barracuda-BRTS-Status: 1 X-Barracuda-Spam-Score: 0.00 X-Barracuda-Spam-Status: No, SCORE=0.00 using per-user scores of TAG_LEVEL=1000.0 QUARANTINE_LEVEL=1000.0 KILL_LEVEL=9.0 tests= X-Barracuda-Spam-Report: Code version 3.2, rules version 3.2.3.27451 Rule breakdown below pts rule name description ---- ---------------------- -------------------------------------------------- X-CFilter-Loop: Reflected X-Brightmail-Tracker: H4sIAAAAAAAAA01TbUgTcRzuv7vmqbu6ttJf0zCvF1LzpReldy2ShAyCYB8qqJs7t+Xe2m2l fShhmRQhkiBmihJlM9NFiJl9aA2MjAprGmmmS/xgoWUklJrV3e5m+/bc8/ye//P87s+fwJSX ItSE0eJg7RbGRMuj8JysdZrUi/f7NBktrvRtP73nclDepeqsw+ho1C4dazKeYe3pe05GGR5O f8ZtnUnF32Y/ykvRQOIVFEkAtRVe1bUsFnEM9A575FdQFKGkhhAEPnUjUciE8ck+mShMI7jj rpAc6eDvHZCLeCf0VdbhIk4F3/MbSDTUIJh6eQ0XPzoQVA7VYMKUnNoAtzsf8ccSxHIqDnoq gmYVlQzPLs4FR3BqHbxpf40JI0BthtbXRwSa5GFzuUsu4mXQc30saMUogKfj41io28zIO2kB Ghq63VLnFPjuvizxu6HLWy4Xj0+AwdF4kV4PgxOuCBGrobzpk7RWPHxtDkjrXoCKD4+DKwL1 DsHoTL1kWAlP3e/xSrSqNqxebVi9RiS7i2hzgdZs1Z5lbBkZm9OcBVyhmdUZCxhTASvcbZrV rn+Agre75lon+uXa50MUgWgF2Zjp1ygXM2e4ErMPpRMyegU5ca9Po1yitepKDAxnOGF3mliO Xk5iV3maXKC1TlORDwGB8dLqckHSMSXnWLtVNPhQHIHTseR8WYVGSekZB1vEsjbWHlIzCYIG 8mcbb1xmZ/VscaHR5AjJvC9JUKhwRQyUEZE+lEoo+FSrR0jlbIyZM+olo4psa+BZRYgVTC9Q LuHtCrTKlLjFamHVseRk8HBhxuC0LKSqY8gTpbywNEwQ/KFX8QWl8L9MRSYJuQr+ X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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:114167 Archived-At: C-x v d put me in version control dired mode for a mercurial-controlled directory. C-x v m then says Running "hg merge"... abort: branch 'logit' has one head - please merge with an explicit rev (run 'hg heads' to see all heads) It doesn't seem there's any way to specify the merge target. I am not prompted for it, even if using C-u as a prefix. vc.el says ;; - merge-branch () ;; ;; Merge another branch into the current one, prompting for a ;; location to merge from. ;; but in vc-hg.el that does not seem to be the behavior. This is probably a known problem, since the header on vc-hg.el has ;; - merge (file rev1 rev2) NEEDED This comment remains in the latest git revision. In GNU Emacs 24.3.1 (x86_64-pc-linux-gnu, GTK+ Version 3.10.7) of 2014-03-07 on lamiak, modified by Debian System Description: Ubuntu 14.04.4 LTS Configured using: `configure '--build' 'x86_64-linux-gnu' '--build' 'x86_64-linux-gnu' '--prefix=/usr' '--sharedstatedir=/var/lib' '--libexecdir=/usr/lib' '--localstatedir=/var/lib' '--infodir=/usr/share/info' '--mandir=/usr/share/man' '--with-pop=yes' '--enable-locallisppath=/etc/emacs24:/etc/emacs:/usr/local/share/emacs/24.3/site-lisp:/usr/local/share/emacs/site-lisp:/usr/share/emacs/24.3/site-lisp:/usr/share/emacs/site-lisp' '--with-crt-dir=/usr/lib/x86_64-linux-gnu' '--with-x=yes' '--with-x-toolkit=gtk3' '--with-toolkit-scroll-bars' 'build_alias=x86_64-linux-gnu' 'CFLAGS=-g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall' 'LDFLAGS=-Wl,-Bsymbolic-functions -Wl,-z,relro' 'CPPFLAGS=-D_FORTIFY_SOURCE=2'' Important settings: value of $LANG: en_US.UTF-8 locale-coding-system: utf-8-unix default enable-multibyte-characters: t Major mode: Emacs-Lisp Minor modes in effect: shell-dirtrack-mode: t tooltip-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 auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t buffer-read-only: t line-number-mode: t transient-mark-mode: t Recent input: G M C-g # # SPC n e w SPC d a y RET d a t e ; SPC h g SPC h e a d s RET C-x v d RET C-x v m C-u C-x v m C-h c C-x v m C-h f v c - m e r g e RET C-x o ESC O B ESC O C ESC O C RET ESC [ 6 ~ ESC [ 5 ~ C-s v c - m e r g e C-s - b C-s C-s C-s C-s C-s C-g C-g ESC O A ESC O A ESC O A ESC O A ESC O A ESC O A ESC O A ESC O A ESC O A ESC O A ESC O C ESC O C ESC O C ESC O C ESC O C ESC O C ESC O C C-r v c - c a l l - b a c k e n d C-r C-r C-r C-r C-r RET C-r d e f u n SPC v c - c a l l C-s C-s C-s ESC < C-s v c - c a l l - b a c k e n d C-s C-s C-s C-s C-s C-s C-s C-s C-s C-s C-s C-s ESC < ESC [ 6 ~ ESC [ 6 ~ ESC [ 6 ~ ESC [ 6 ~ ESC [ 6 ~ C-x C-f v c - h g TAB RET C-s d e f u n SPC m e r DEL DEL DEL v c - m e r g e RET C-s m e r g e - b r ESC < ESC [ 6 ~ ESC [ 5 ~ ESC x r e p o r t - b u g RET Recent messages: uncompressing vc.el.gz...done Note: file is write protected Quit Mark saved where search started [2 times] Mark set Mark saved where search started Mark set uncompressing vc-hg.el.gz...done Note: file is write protected Mark saved where search started [2 times] Load-path shadows: /usr/share/emacs/24.3/site-lisp/debian-startup hides /usr/share/emacs/site-lisp/debian-startup Features: (shadow sort gnus-util mail-extr emacsbug message rfc822 mml mml-sec mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils find-func vc-git vc-bzr vc-sccs vc-svn vc-cvs vc-rcs vc-dir ewoc vc vc-dispatcher help-mode misearch multi-isearch dired ediff-merg ediff-diff ediff-wind ediff-help ediff-util ediff-mult ediff-init ediff server jka-compr info vc-hg ido ess-toolbar ess-mouse mouseme thingatpt browse-url ess-menu ess-swv ess-noweb ess-noweb-font-lock-mode ess-bugs-l essd-els ess-sas-d ess-sas-l ess-sas-a shell pcomplete ess-sta-d ess-sta-l cc-vars cc-defs make-regexp ess-sp6-d ess-sp3-d ess-julia ess-r-d compile ess-tracebug format-spec ess-roxy advice cl-lib advice-preload hideshow ess-help ess-developer ess-r-args eldoc help-fns ess-s-l ess ess-inf comint ansi-color ring ess-mode ess-noweb-mode ess-utils time-date ess-custom executable easymenu ess-compat ess-site emacs-goodies-el emacs-goodies-custom emacs-goodies-loaddefs easy-mmode tooltip ediff-hook vc-hooks lisp-float-type mwheel x-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list newcomment lisp-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 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 dynamic-setting system-font-setting font-render-setting move-toolbar gtk x-toolkit x multi-tty emacs)