* bug#5232: 23.1.90; vc-hg-working-revision always gives latest revision in which file changed @ 2009-12-16 17:12 ` Magnus Henoch 2010-01-04 5:15 ` bug#5232: marked as done (23.1.90; vc-hg-working-revision always gives latest revision in which file changed) Emacs bug Tracking System 0 siblings, 1 reply; 5+ messages in thread From: Magnus Henoch @ 2009-12-16 17:12 UTC (permalink / raw) To: emacs-pretest-bug When the revision currently checked out is not the latest revision that touched the file in question, vc-hg-working-revision gives the wrong result. This can happen in two cases: you have checked out a non-head revision, or the file has been changed in another branch. Two test cases: /tmp $ mkdir hgtest /tmp $ cd hgtest /tmp/hgtest $ hg init /tmp/hgtest $ echo foo > foo.txt /tmp/hgtest $ hg add foo.txt /tmp/hgtest $ hg commit -m "Added foo.txt" /tmp/hgtest $ echo bar > foo.txt /tmp/hgtest $ hg commit -m "Changed foo to bar" /tmp/hgtest $ hg up -r 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved /tmp $ mkdir hgtest2 /tmp $ cd hgtest2 /tmp/hgtest2 $ hg init /tmp/hgtest2 $ echo foo > foo.txt /tmp/hgtest2 $ hg add foo.txt /tmp/hgtest2 $ hg commit -m "Added foo.txt" /tmp/hgtest2 $ hg branch bar marked working directory as branch bar /tmp/hgtest2 $ echo bar > foo.txt /tmp/hgtest2 $ hg commit -m "Changed foo to bar" /tmp/hgtest2 $ hg update -r default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved /tmp/hgtest2 $ echo frobozz > frobozz.txt /tmp/hgtest2 $ hg add frobozz.txt /tmp/hgtest2 $ hg commit -m "Added frobozz.txt" created new head In either case, the symptoms are the same: if you open foo.txt in emacs, the mode line says "Hg-1" instead of the expected "Hg-0", and if you hit C-x v g, foo.txt seems to contain "bar" instead of "foo". It's not obvious to me how to solve this properly. The following patch fixes the first case, but not the second. ("hg log --follow" would be logical, but it seems that "--follow" means something completely different if you specify a file.) diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index 91e9d68..484dc0e 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el @@ -209,7 +209,9 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." ;; Ignore all errors. (process-file "hg" nil t nil - "log" "-l1" (file-relative-name file))) + "log" "-l1" + "-r" ".:0" + (file-relative-name file))) ;; Some problem happened. E.g. We can't find an `hg' ;; executable. (error nil))))))) In GNU Emacs 23.1.90.1 (i686-pc-linux-gnu, GTK+ Version 2.18.1) of 2009-12-15 on linux-b2a3 Windowing system distributor `The X.Org Foundation', version 11.0.10605000 Important settings: value of $LC_ALL: nil value of $LC_COLLATE: C 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: @im=local locale-coding-system: utf-8-unix default enable-multibyte-characters: t Major mode: Emacs-Lisp Minor modes in effect: diff-auto-refine-mode: t shell-dirtrack-mode: t jabber-activity-mode: t jabber-mode-line-mode: t eldoc-mode: t show-paren-mode: t server-mode: t ido-everywhere: t icomplete-mode: t display-time-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 line-number-mode: t transient-mark-mode: t Recent input: - n " ) <return> C-x C-f C-x <escape> <escape> <escape> C-x 4 b f o o <return> M-! C-g M-: <up> <return> M-! h g SPC i d SPC - - h e l p <return> C-h f s t r i p <tab> <tab> <backspace> n g <tab> <tab> C-g C-x 4 b <return> ( s h e l l - c o m m <M-tab> - t o <M-tab> SPC " h g SPC i d SPC - n " ) ) C-x C-s M-! h g SPC C-g <Scroll_Lock> C-x C-j C-l C-x C-j C-l <help-echo> <help-echo> <help-echo> <down-mouse-1> <mouse-1> M-! h g SPC h e l p <return> <C-s-down> <next> M-! h g SPC h e l p SPC s e <backspace> <backspace> e <backspace> r e v i s i o n l s <backspace> <backspace> s <return> <C-s-up> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> C-M-k C-d M-m M-d C-d C-e <left> . C-x C-s C-M-x C-x b f o o <return> M-x r e v e r t <return> y e s <return> C-x b <return> C-x 4 b <return> M-! h g SPC l o g SPC - r SPC 0 : . <return> M-! <up> C-e <left> <right> <left> <left> <left> <left> C-f C-g C-g <C-s-up> <left> <left> <left> <backspace> " SPC " C-x C-s C-M-x <C-s-down> M-x r e v e r t <return> y e s <return> <C-s-up> C-x v = C-x b f o o <return> C-x v g <C-backspace> C-x 4 b <return> M-x r e p o r t - e m <tab> <return> Recent messages: Quit [2 times] Saving file /home/magnus/src/emacs/lisp/vc-hg.el... Wrote /home/magnus/src/emacs/lisp/vc-hg.el vc-hg-working-revision Finding changes in /home/magnus/src/emacs/lisp/vc-hg.el...done Annotating... Redisplaying annotation...done (Spanned from 0.0 to 0.0 days old) Mark set Annotating... done Load-path shadows: ~/emacs/org-mode/lisp/org-html hides /usr/local/share/emacs/23.1.90/lisp/org/org-html ~/emacs/org-mode/lisp/org-table hides /usr/local/share/emacs/23.1.90/lisp/org/org-table ~/emacs/org-mode/lisp/org-bbdb hides /usr/local/share/emacs/23.1.90/lisp/org/org-bbdb ~/emacs/org-mode/lisp/org-mouse hides /usr/local/share/emacs/23.1.90/lisp/org/org-mouse ~/emacs/org-mode/lisp/org-rmail hides /usr/local/share/emacs/23.1.90/lisp/org/org-rmail ~/emacs/org-mode/lisp/org-compat hides /usr/local/share/emacs/23.1.90/lisp/org/org-compat ~/emacs/org-mode/lisp/org-latex hides /usr/local/share/emacs/23.1.90/lisp/org/org-latex ~/emacs/org-mode/lisp/org-gnus hides /usr/local/share/emacs/23.1.90/lisp/org/org-gnus ~/emacs/org-mode/lisp/org-habit hides /usr/local/share/emacs/23.1.90/lisp/org/org-habit ~/emacs/org-mode/lisp/org-exp hides /usr/local/share/emacs/23.1.90/lisp/org/org-exp ~/emacs/org-mode/lisp/org-src hides /usr/local/share/emacs/23.1.90/lisp/org/org-src ~/emacs/org-mode/lisp/org-plot hides /usr/local/share/emacs/23.1.90/lisp/org/org-plot ~/emacs/org-mode/lisp/org-publish hides /usr/local/share/emacs/23.1.90/lisp/org/org-publish ~/emacs/org-mode/lisp/org-bibtex hides /usr/local/share/emacs/23.1.90/lisp/org/org-bibtex ~/emacs/org-mode/lisp/org-xoxo hides /usr/local/share/emacs/23.1.90/lisp/org/org-xoxo ~/emacs/org-mode/lisp/org-remember hides /usr/local/share/emacs/23.1.90/lisp/org/org-remember ~/emacs/org-mode/lisp/org-crypt hides /usr/local/share/emacs/23.1.90/lisp/org/org-crypt ~/emacs/org-mode/lisp/org-timer hides /usr/local/share/emacs/23.1.90/lisp/org/org-timer ~/emacs/org-mode/lisp/org-vm hides /usr/local/share/emacs/23.1.90/lisp/org/org-vm ~/emacs/org-mode/lisp/org hides /usr/local/share/emacs/23.1.90/lisp/org/org ~/emacs/org-mode/lisp/org-mew hides /usr/local/share/emacs/23.1.90/lisp/org/org-mew ~/emacs/org-mode/lisp/org-archive hides /usr/local/share/emacs/23.1.90/lisp/org/org-archive ~/emacs/org-mode/lisp/org-indent hides /usr/local/share/emacs/23.1.90/lisp/org/org-indent ~/emacs/org-mode/lisp/org-agenda hides /usr/local/share/emacs/23.1.90/lisp/org/org-agenda ~/emacs/org-mode/lisp/org-exp-blocks hides /usr/local/share/emacs/23.1.90/lisp/org/org-exp-blocks ~/emacs/org-mode/lisp/org-id hides /usr/local/share/emacs/23.1.90/lisp/org/org-id ~/emacs/org-mode/lisp/org-install hides /usr/local/share/emacs/23.1.90/lisp/org/org-install ~/emacs/org-mode/lisp/org-datetree hides /usr/local/share/emacs/23.1.90/lisp/org/org-datetree ~/emacs/org-mode/lisp/org-clock hides /usr/local/share/emacs/23.1.90/lisp/org/org-clock ~/emacs/org-mode/lisp/org-w3m hides /usr/local/share/emacs/23.1.90/lisp/org/org-w3m ~/emacs/org-mode/lisp/org-irc hides /usr/local/share/emacs/23.1.90/lisp/org/org-irc ~/emacs/org-mode/lisp/org-inlinetask hides /usr/local/share/emacs/23.1.90/lisp/org/org-inlinetask ~/emacs/org-mode/lisp/org-mac-message hides /usr/local/share/emacs/23.1.90/lisp/org/org-mac-message ~/emacs/org-mode/lisp/org-list hides /usr/local/share/emacs/23.1.90/lisp/org/org-list ~/emacs/org-mode/lisp/org-colview hides /usr/local/share/emacs/23.1.90/lisp/org/org-colview ~/emacs/org-mode/lisp/org-mobile hides /usr/local/share/emacs/23.1.90/lisp/org/org-mobile ~/emacs/org-mode/lisp/org-attach hides /usr/local/share/emacs/23.1.90/lisp/org/org-attach ~/emacs/org-mode/lisp/org-wl hides /usr/local/share/emacs/23.1.90/lisp/org/org-wl ~/emacs/org-mode/lisp/org-info hides /usr/local/share/emacs/23.1.90/lisp/org/org-info ~/emacs/org-mode/lisp/org-macs hides /usr/local/share/emacs/23.1.90/lisp/org/org-macs ~/emacs/org-mode/lisp/org-mhe hides /usr/local/share/emacs/23.1.90/lisp/org/org-mhe ~/emacs/org-mode/lisp/org-jsinfo hides /usr/local/share/emacs/23.1.90/lisp/org/org-jsinfo ~/emacs/org-mode/lisp/org-freemind hides /usr/local/share/emacs/23.1.90/lisp/org/org-freemind ~/emacs/org-mode/lisp/org-icalendar hides /usr/local/share/emacs/23.1.90/lisp/org/org-icalendar ~/emacs/org-mode/lisp/org-feed hides /usr/local/share/emacs/23.1.90/lisp/org/org-feed ~/emacs/org-mode/lisp/org-footnote hides /usr/local/share/emacs/23.1.90/lisp/org/org-footnote ~/emacs/org-mode/lisp/org-protocol hides /usr/local/share/emacs/23.1.90/lisp/org/org-protocol ~/emacs/org-mode/lisp/org-ascii hides /usr/local/share/emacs/23.1.90/lisp/org/org-ascii ~/emacs/org-mode/lisp/org-docbook hides /usr/local/share/emacs/23.1.90/lisp/org/org-docbook ~/emacs/org-mode/lisp/org-faces hides /usr/local/share/emacs/23.1.90/lisp/org/org-faces ~/emacs/emms/lisp/tq hides /usr/local/share/emacs/23.1.90/lisp/emacs-lisp/tq Features: (shadow emacsbug diff-mode imenu vc-git jka-compr find-func pp em-unix pcomplete em-term term ehelp electric em-script em-prompt em-ls em-hist em-pred em-glob em-dirs em-cmpl em-basic esh-opt em-banner em-alias esh-var esh-io esh-cmd esh-ext esh-proc esh-arg esh-groups eshell esh-module esh-mode esh-util add-log log-view pcvs-util vc-annotate vc vc-dispatcher vc-hg 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 mule-util cal-move org-clock multi-isearch cc-mode cc-fonts cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs sh-script executable tabify man cal-china lunar solar cal-dst cal-bahai cal-islam cal-hebrew holidays hol-loaddefs diary-lib diary-loaddefs cal-iso cal-menu calendar cal-loaddefs tramp-imap epa epg imap-hash tramp-gw tramp-fish tramp-smb tramp-cache tramp-ftp tramp-cmds tramp shell tramp-compat trampver descr-text help-mode view browse-url mailalias smtpmail newcomment locate bbdb-gui flow-fill gnus-cite smiley ansi-color gnus-async gnus-bcklg sort gnus-ml disp-table nndoc parse-time nnfolder utf-7 utf7 auth-source nnimap imap nndraft nnmh copyright nnml gnus-agent gnus-srvr gnus-score score-mode nnvirtual nntp gnus-cache spam spam-stat gnus-uu yenc gnus-msg goto-addr thingatpt sasl-digest hmac-md5 jabber-gmail jabber-keepalive jabber-bookmarks jabber-private jabber jabber-awesome jabber-osd jabber-wmii jabber-xmessage jabber-festival jabber-sawfish jabber-ratpoison jabber-screen jabber-socks5 jabber-ft-server jabber-si-server jabber-ft-client jabber-ft-common jabber-si-client jabber-si-common jabber-feature-neg jabber-truncate jabber-time jabber-autoaway jabber-vcard-avatars jabber-chatstates jabber-events jabber-vcard jabber-avatar jabber-activity jabber-watch jabber-modeline jabber-ahc-presence jabber-ahc jabber-version jabber-ourversion jabber-muc-nick-completion hippie-exp jabber-browse jabber-search jabber-register jabber-roster jabber-presence assoc jabber-muc jabber-newdisco jabber-widget jabber-disco jabber-chat ewoc jabber-history jabber-chatbuffer jabber-alert jabber-iq jabber-keymap jabber-core jabber-sasl sasl sasl-anonymous sasl-login sasl-plain fsm jabber-logon jabber-conn srv dns starttls tls jabber-xml xml jabber-menu eldoc org-feed org-w3m org-wl org-vm org-rmail org-mhe org-mew org-irc org-jsinfo org-infojs org-html org-exp org-exp-blocks org-agenda org-info org-gnus org-bibtex org-bbdb paren server ido icomplete time cus-start cus-load emms-playlist-sort emms-last-played emms-info-libtag emms-lastfm emms-url emms-playing-time emms-mode-line url url-proxy url-privacy url-expand url-methods url-history url-cookie url-util url-parse url-vars emms-cache emms-info-ogginfo emms-info-mp3info emms-info later-do emms-playlist-mode emms-player-vlc emms-player-mplayer emms-player-simple emms-source-playlist emms-source-file dired emms-setup emms emms-compat bbdb-gnus gnus-art mm-uu mml2015 epg-config mm-view smime dig gnus-sum nnoo gnus-group gnus-undo nnmail mail-source format-spec gnus-start gnus-spec gnus-int gnus-range message sendmail ecomplete mml mml-sec password-cache mm-decode mm-bodies mm-encode mailcap mail-parse rfc2231 rfc2047 rfc2045 qp ietf-drums gmm-utils mailheader canlock sha1 hex-util hashcash gnus-win gnus gnus-ems nnheader gnus-util netrc mail-utils mm-util mail-prsvr wid-edit bbdb-snarf mail-extr rfc822 bbdb-com warnings mailabbrev bbdb-autoloads bbdb regexp-opt timezone patmatch erl-service derived derl erlext epmd net-fsm erl wrangler erlang flymake compile comint ring w3-auto edmacro kmacro remember org-remember org-datetree org byte-opt bytecomp byte-compile org-footnote org-src org-list org-faces org-compat org-macs easymenu time-date noutline outline easy-mmode org-redmine cl cl-19 org-install uniquify advice help-fns advice-preload vc-p4 p4-lowlevel lfe-mode erlang-web-template tempo erlang-start jabber-autoloads jabber-util tooltip ediff-hook vc-hooks lisp-float-type mwheel x-win x-dnd font-setting tool-bar dnd fontset image fringe lisp-mode register page menu-bar rfn-eshadow timer select scroll-bar mldrag 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 loaddefs button minibuffer faces cus-face text-properties overlay md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote make-network-process dbusbind system-font-setting font-render-setting gtk x-toolkit x multi-tty emacs) ^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#5232: marked as done (23.1.90; vc-hg-working-revision always gives latest revision in which file changed) 2009-12-16 17:12 ` bug#5232: 23.1.90; vc-hg-working-revision always gives latest revision in which file changed Magnus Henoch @ 2010-01-04 5:15 ` Emacs bug Tracking System 0 siblings, 0 replies; 5+ messages in thread From: Emacs bug Tracking System @ 2010-01-04 5:15 UTC (permalink / raw) To: Dan Nicolaescu; +Cc: emacs-bug-tracker [-- Attachment #1: Type: text/plain, Size: 948 bytes --] Your message dated Sun, 3 Jan 2010 21:14:01 -0800 (PST) with message-id <201001040514.o045E1Aq019172@godzilla.ics.uci.edu> and subject line Re: bug#5232: 23.1.90; vc-hg-working-revision always gives latest revision in which file changed has caused the Emacs bug report #5232, regarding 23.1.90; vc-hg-working-revision always gives latest revision in which file changed to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact bug-gnu-emacs@gnu.org immediately.) -- 5232: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=5232 Emacs Bug Tracking System Contact bug-gnu-emacs@gnu.org with problems [-- Attachment #2: Type: message/rfc822, Size: 16427 bytes --] From: Magnus Henoch <magnus@erlang-consulting.com> To: emacs-pretest-bug@gnu.org Subject: 23.1.90; vc-hg-working-revision always gives latest revision in which file changed Date: Wed, 16 Dec 2009 17:12:30 +0000 Message-ID: <84k4wmlu69.fsf@linux-b2a3.site> When the revision currently checked out is not the latest revision that touched the file in question, vc-hg-working-revision gives the wrong result. This can happen in two cases: you have checked out a non-head revision, or the file has been changed in another branch. Two test cases: /tmp $ mkdir hgtest /tmp $ cd hgtest /tmp/hgtest $ hg init /tmp/hgtest $ echo foo > foo.txt /tmp/hgtest $ hg add foo.txt /tmp/hgtest $ hg commit -m "Added foo.txt" /tmp/hgtest $ echo bar > foo.txt /tmp/hgtest $ hg commit -m "Changed foo to bar" /tmp/hgtest $ hg up -r 0 1 files updated, 0 files merged, 0 files removed, 0 files unresolved /tmp $ mkdir hgtest2 /tmp $ cd hgtest2 /tmp/hgtest2 $ hg init /tmp/hgtest2 $ echo foo > foo.txt /tmp/hgtest2 $ hg add foo.txt /tmp/hgtest2 $ hg commit -m "Added foo.txt" /tmp/hgtest2 $ hg branch bar marked working directory as branch bar /tmp/hgtest2 $ echo bar > foo.txt /tmp/hgtest2 $ hg commit -m "Changed foo to bar" /tmp/hgtest2 $ hg update -r default 1 files updated, 0 files merged, 0 files removed, 0 files unresolved /tmp/hgtest2 $ echo frobozz > frobozz.txt /tmp/hgtest2 $ hg add frobozz.txt /tmp/hgtest2 $ hg commit -m "Added frobozz.txt" created new head In either case, the symptoms are the same: if you open foo.txt in emacs, the mode line says "Hg-1" instead of the expected "Hg-0", and if you hit C-x v g, foo.txt seems to contain "bar" instead of "foo". It's not obvious to me how to solve this properly. The following patch fixes the first case, but not the second. ("hg log --follow" would be logical, but it seems that "--follow" means something completely different if you specify a file.) diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index 91e9d68..484dc0e 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el @@ -209,7 +209,9 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." ;; Ignore all errors. (process-file "hg" nil t nil - "log" "-l1" (file-relative-name file))) + "log" "-l1" + "-r" ".:0" + (file-relative-name file))) ;; Some problem happened. E.g. We can't find an `hg' ;; executable. (error nil))))))) In GNU Emacs 23.1.90.1 (i686-pc-linux-gnu, GTK+ Version 2.18.1) of 2009-12-15 on linux-b2a3 Windowing system distributor `The X.Org Foundation', version 11.0.10605000 Important settings: value of $LC_ALL: nil value of $LC_COLLATE: C 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: @im=local locale-coding-system: utf-8-unix default enable-multibyte-characters: t Major mode: Emacs-Lisp Minor modes in effect: diff-auto-refine-mode: t shell-dirtrack-mode: t jabber-activity-mode: t jabber-mode-line-mode: t eldoc-mode: t show-paren-mode: t server-mode: t ido-everywhere: t icomplete-mode: t display-time-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 line-number-mode: t transient-mark-mode: t Recent input: - n " ) <return> C-x C-f C-x <escape> <escape> <escape> C-x 4 b f o o <return> M-! C-g M-: <up> <return> M-! h g SPC i d SPC - - h e l p <return> C-h f s t r i p <tab> <tab> <backspace> n g <tab> <tab> C-g C-x 4 b <return> ( s h e l l - c o m m <M-tab> - t o <M-tab> SPC " h g SPC i d SPC - n " ) ) C-x C-s M-! h g SPC C-g <Scroll_Lock> C-x C-j C-l C-x C-j C-l <help-echo> <help-echo> <help-echo> <down-mouse-1> <mouse-1> M-! h g SPC h e l p <return> <C-s-down> <next> M-! h g SPC h e l p SPC s e <backspace> <backspace> e <backspace> r e v i s i o n l s <backspace> <backspace> s <return> <C-s-up> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> <left> C-M-k C-d M-m M-d C-d C-e <left> . C-x C-s C-M-x C-x b f o o <return> M-x r e v e r t <return> y e s <return> C-x b <return> C-x 4 b <return> M-! h g SPC l o g SPC - r SPC 0 : . <return> M-! <up> C-e <left> <right> <left> <left> <left> <left> C-f C-g C-g <C-s-up> <left> <left> <left> <backspace> " SPC " C-x C-s C-M-x <C-s-down> M-x r e v e r t <return> y e s <return> <C-s-up> C-x v = C-x b f o o <return> C-x v g <C-backspace> C-x 4 b <return> M-x r e p o r t - e m <tab> <return> Recent messages: Quit [2 times] Saving file /home/magnus/src/emacs/lisp/vc-hg.el... Wrote /home/magnus/src/emacs/lisp/vc-hg.el vc-hg-working-revision Finding changes in /home/magnus/src/emacs/lisp/vc-hg.el...done Annotating... Redisplaying annotation...done (Spanned from 0.0 to 0.0 days old) Mark set Annotating... done Load-path shadows: ~/emacs/org-mode/lisp/org-html hides /usr/local/share/emacs/23.1.90/lisp/org/org-html ~/emacs/org-mode/lisp/org-table hides /usr/local/share/emacs/23.1.90/lisp/org/org-table ~/emacs/org-mode/lisp/org-bbdb hides /usr/local/share/emacs/23.1.90/lisp/org/org-bbdb ~/emacs/org-mode/lisp/org-mouse hides /usr/local/share/emacs/23.1.90/lisp/org/org-mouse ~/emacs/org-mode/lisp/org-rmail hides /usr/local/share/emacs/23.1.90/lisp/org/org-rmail ~/emacs/org-mode/lisp/org-compat hides /usr/local/share/emacs/23.1.90/lisp/org/org-compat ~/emacs/org-mode/lisp/org-latex hides /usr/local/share/emacs/23.1.90/lisp/org/org-latex ~/emacs/org-mode/lisp/org-gnus hides /usr/local/share/emacs/23.1.90/lisp/org/org-gnus ~/emacs/org-mode/lisp/org-habit hides /usr/local/share/emacs/23.1.90/lisp/org/org-habit ~/emacs/org-mode/lisp/org-exp hides /usr/local/share/emacs/23.1.90/lisp/org/org-exp ~/emacs/org-mode/lisp/org-src hides /usr/local/share/emacs/23.1.90/lisp/org/org-src ~/emacs/org-mode/lisp/org-plot hides /usr/local/share/emacs/23.1.90/lisp/org/org-plot ~/emacs/org-mode/lisp/org-publish hides /usr/local/share/emacs/23.1.90/lisp/org/org-publish ~/emacs/org-mode/lisp/org-bibtex hides /usr/local/share/emacs/23.1.90/lisp/org/org-bibtex ~/emacs/org-mode/lisp/org-xoxo hides /usr/local/share/emacs/23.1.90/lisp/org/org-xoxo ~/emacs/org-mode/lisp/org-remember hides /usr/local/share/emacs/23.1.90/lisp/org/org-remember ~/emacs/org-mode/lisp/org-crypt hides /usr/local/share/emacs/23.1.90/lisp/org/org-crypt ~/emacs/org-mode/lisp/org-timer hides /usr/local/share/emacs/23.1.90/lisp/org/org-timer ~/emacs/org-mode/lisp/org-vm hides /usr/local/share/emacs/23.1.90/lisp/org/org-vm ~/emacs/org-mode/lisp/org hides /usr/local/share/emacs/23.1.90/lisp/org/org ~/emacs/org-mode/lisp/org-mew hides /usr/local/share/emacs/23.1.90/lisp/org/org-mew ~/emacs/org-mode/lisp/org-archive hides /usr/local/share/emacs/23.1.90/lisp/org/org-archive ~/emacs/org-mode/lisp/org-indent hides /usr/local/share/emacs/23.1.90/lisp/org/org-indent ~/emacs/org-mode/lisp/org-agenda hides /usr/local/share/emacs/23.1.90/lisp/org/org-agenda ~/emacs/org-mode/lisp/org-exp-blocks hides /usr/local/share/emacs/23.1.90/lisp/org/org-exp-blocks ~/emacs/org-mode/lisp/org-id hides /usr/local/share/emacs/23.1.90/lisp/org/org-id ~/emacs/org-mode/lisp/org-install hides /usr/local/share/emacs/23.1.90/lisp/org/org-install ~/emacs/org-mode/lisp/org-datetree hides /usr/local/share/emacs/23.1.90/lisp/org/org-datetree ~/emacs/org-mode/lisp/org-clock hides /usr/local/share/emacs/23.1.90/lisp/org/org-clock ~/emacs/org-mode/lisp/org-w3m hides /usr/local/share/emacs/23.1.90/lisp/org/org-w3m ~/emacs/org-mode/lisp/org-irc hides /usr/local/share/emacs/23.1.90/lisp/org/org-irc ~/emacs/org-mode/lisp/org-inlinetask hides /usr/local/share/emacs/23.1.90/lisp/org/org-inlinetask ~/emacs/org-mode/lisp/org-mac-message hides /usr/local/share/emacs/23.1.90/lisp/org/org-mac-message ~/emacs/org-mode/lisp/org-list hides /usr/local/share/emacs/23.1.90/lisp/org/org-list ~/emacs/org-mode/lisp/org-colview hides /usr/local/share/emacs/23.1.90/lisp/org/org-colview ~/emacs/org-mode/lisp/org-mobile hides /usr/local/share/emacs/23.1.90/lisp/org/org-mobile ~/emacs/org-mode/lisp/org-attach hides /usr/local/share/emacs/23.1.90/lisp/org/org-attach ~/emacs/org-mode/lisp/org-wl hides /usr/local/share/emacs/23.1.90/lisp/org/org-wl ~/emacs/org-mode/lisp/org-info hides /usr/local/share/emacs/23.1.90/lisp/org/org-info ~/emacs/org-mode/lisp/org-macs hides /usr/local/share/emacs/23.1.90/lisp/org/org-macs ~/emacs/org-mode/lisp/org-mhe hides /usr/local/share/emacs/23.1.90/lisp/org/org-mhe ~/emacs/org-mode/lisp/org-jsinfo hides /usr/local/share/emacs/23.1.90/lisp/org/org-jsinfo ~/emacs/org-mode/lisp/org-freemind hides /usr/local/share/emacs/23.1.90/lisp/org/org-freemind ~/emacs/org-mode/lisp/org-icalendar hides /usr/local/share/emacs/23.1.90/lisp/org/org-icalendar ~/emacs/org-mode/lisp/org-feed hides /usr/local/share/emacs/23.1.90/lisp/org/org-feed ~/emacs/org-mode/lisp/org-footnote hides /usr/local/share/emacs/23.1.90/lisp/org/org-footnote ~/emacs/org-mode/lisp/org-protocol hides /usr/local/share/emacs/23.1.90/lisp/org/org-protocol ~/emacs/org-mode/lisp/org-ascii hides /usr/local/share/emacs/23.1.90/lisp/org/org-ascii ~/emacs/org-mode/lisp/org-docbook hides /usr/local/share/emacs/23.1.90/lisp/org/org-docbook ~/emacs/org-mode/lisp/org-faces hides /usr/local/share/emacs/23.1.90/lisp/org/org-faces ~/emacs/emms/lisp/tq hides /usr/local/share/emacs/23.1.90/lisp/emacs-lisp/tq Features: (shadow emacsbug diff-mode imenu vc-git jka-compr find-func pp em-unix pcomplete em-term term ehelp electric em-script em-prompt em-ls em-hist em-pred em-glob em-dirs em-cmpl em-basic esh-opt em-banner em-alias esh-var esh-io esh-cmd esh-ext esh-proc esh-arg esh-groups eshell esh-module esh-mode esh-util add-log log-view pcvs-util vc-annotate vc vc-dispatcher vc-hg 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 mule-util cal-move org-clock multi-isearch cc-mode cc-fonts cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs sh-script executable tabify man cal-china lunar solar cal-dst cal-bahai cal-islam cal-hebrew holidays hol-loaddefs diary-lib diary-loaddefs cal-iso cal-menu calendar cal-loaddefs tramp-imap epa epg imap-hash tramp-gw tramp-fish tramp-smb tramp-cache tramp-ftp tramp-cmds tramp shell tramp-compat trampver descr-text help-mode view browse-url mailalias smtpmail newcomment locate bbdb-gui flow-fill gnus-cite smiley ansi-color gnus-async gnus-bcklg sort gnus-ml disp-table nndoc parse-time nnfolder utf-7 utf7 auth-source nnimap imap nndraft nnmh copyright nnml gnus-agent gnus-srvr gnus-score score-mode nnvirtual nntp gnus-cache spam spam-stat gnus-uu yenc gnus-msg goto-addr thingatpt sasl-digest hmac-md5 jabber-gmail jabber-keepalive jabber-bookmarks jabber-private jabber jabber-awesome jabber-osd jabber-wmii jabber-xmessage jabber-festival jabber-sawfish jabber-ratpoison jabber-screen jabber-socks5 jabber-ft-server jabber-si-server jabber-ft-client jabber-ft-common jabber-si-client jabber-si-common jabber-feature-neg jabber-truncate jabber-time jabber-autoaway jabber-vcard-avatars jabber-chatstates jabber-events jabber-vcard jabber-avatar jabber-activity jabber-watch jabber-modeline jabber-ahc-presence jabber-ahc jabber-version jabber-ourversion jabber-muc-nick-completion hippie-exp jabber-browse jabber-search jabber-register jabber-roster jabber-presence assoc jabber-muc jabber-newdisco jabber-widget jabber-disco jabber-chat ewoc jabber-history jabber-chatbuffer jabber-alert jabber-iq jabber-keymap jabber-core jabber-sasl sasl sasl-anonymous sasl-login sasl-plain fsm jabber-logon jabber-conn srv dns starttls tls jabber-xml xml jabber-menu eldoc org-feed org-w3m org-wl org-vm org-rmail org-mhe org-mew org-irc org-jsinfo org-infojs org-html org-exp org-exp-blocks org-agenda org-info org-gnus org-bibtex org-bbdb paren server ido icomplete time cus-start cus-load emms-playlist-sort emms-last-played emms-info-libtag emms-lastfm emms-url emms-playing-time emms-mode-line url url-proxy url-privacy url-expand url-methods url-history url-cookie url-util url-parse url-vars emms-cache emms-info-ogginfo emms-info-mp3info emms-info later-do emms-playlist-mode emms-player-vlc emms-player-mplayer emms-player-simple emms-source-playlist emms-source-file dired emms-setup emms emms-compat bbdb-gnus gnus-art mm-uu mml2015 epg-config mm-view smime dig gnus-sum nnoo gnus-group gnus-undo nnmail mail-source format-spec gnus-start gnus-spec gnus-int gnus-range message sendmail ecomplete mml mml-sec password-cache mm-decode mm-bodies mm-encode mailcap mail-parse rfc2231 rfc2047 rfc2045 qp ietf-drums gmm-utils mailheader canlock sha1 hex-util hashcash gnus-win gnus gnus-ems nnheader gnus-util netrc mail-utils mm-util mail-prsvr wid-edit bbdb-snarf mail-extr rfc822 bbdb-com warnings mailabbrev bbdb-autoloads bbdb regexp-opt timezone patmatch erl-service derived derl erlext epmd net-fsm erl wrangler erlang flymake compile comint ring w3-auto edmacro kmacro remember org-remember org-datetree org byte-opt bytecomp byte-compile org-footnote org-src org-list org-faces org-compat org-macs easymenu time-date noutline outline easy-mmode org-redmine cl cl-19 org-install uniquify advice help-fns advice-preload vc-p4 p4-lowlevel lfe-mode erlang-web-template tempo erlang-start jabber-autoloads jabber-util tooltip ediff-hook vc-hooks lisp-float-type mwheel x-win x-dnd font-setting tool-bar dnd fontset image fringe lisp-mode register page menu-bar rfn-eshadow timer select scroll-bar mldrag 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 loaddefs button minibuffer faces cus-face text-properties overlay md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote make-network-process dbusbind system-font-setting font-render-setting gtk x-toolkit x multi-tty emacs) [-- Attachment #3: Type: message/rfc822, Size: 2721 bytes --] From: Dan Nicolaescu <dann@ics.uci.edu> To: Magnus Henoch <magnus@erlang-consulting.com> Cc: 5232-done@emacsbugs.donarmstrong.com Subject: Re: bug#5232: 23.1.90; vc-hg-working-revision always gives latest revision in which file changed Date: Sun, 3 Jan 2010 21:14:01 -0800 (PST) Message-ID: <201001040514.o045E1Aq019172@godzilla.ics.uci.edu> This should be fixed now. ^ permalink raw reply related [flat|nested] 5+ messages in thread
* bug#5232: 23.1.90; vc-hg-working-revision always gives latest revision in which file changed [not found] <201001040514.o045E1Aq019172@godzilla.ics.uci.edu> 2009-12-16 17:12 ` bug#5232: 23.1.90; vc-hg-working-revision always gives latest revision in which file changed Magnus Henoch @ 2010-01-06 15:22 ` Magnus Henoch 2010-01-06 19:02 ` Dan Nicolaescu 1 sibling, 1 reply; 5+ messages in thread From: Magnus Henoch @ 2010-01-06 15:22 UTC (permalink / raw) To: Dan Nicolaescu; +Cc: 5232 Dan Nicolaescu <dann@ics.uci.edu> writes: > This should be fixed now. I still get the same result. Also, I don't see any changes to this function in CVS/Git. Am I missing something? (I'm starting to think that this should actually be fixed in Mercurial. I'll file a bug report.) Magnus --------------------------------------------------- --------------------------------------------------- WE'VE CHANGED NAMES! Since January 1st 2010 Erlang Training and Consulting Ltd. has become ERLANG SOLUTIONS LTD. www.erlang-solutions.com ^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#5232: 23.1.90; vc-hg-working-revision always gives latest revision in which file changed 2010-01-06 15:22 ` bug#5232: 23.1.90; vc-hg-working-revision always gives latest revision in which file changed Magnus Henoch @ 2010-01-06 19:02 ` Dan Nicolaescu 2010-01-07 11:56 ` Magnus Henoch 0 siblings, 1 reply; 5+ messages in thread From: Dan Nicolaescu @ 2010-01-06 19:02 UTC (permalink / raw) To: Magnus Henoch; +Cc: 5232 Magnus Henoch <magnus@erlang-consulting.com> writes: > Dan Nicolaescu <dann@ics.uci.edu> writes: > > > This should be fixed now. > > I still get the same result. > > Also, I don't see any changes to this function in CVS/Git. Am I missing > something? We switched to bzr, so CVS is not updated anymore. Look in bzr... ^ permalink raw reply [flat|nested] 5+ messages in thread
* bug#5232: 23.1.90; vc-hg-working-revision always gives latest revision in which file changed 2010-01-06 19:02 ` Dan Nicolaescu @ 2010-01-07 11:56 ` Magnus Henoch 0 siblings, 0 replies; 5+ messages in thread From: Magnus Henoch @ 2010-01-07 11:56 UTC (permalink / raw) To: Dan Nicolaescu; +Cc: 5232 Dan Nicolaescu <dann@ics.uci.edu> writes: > We switched to bzr, so CVS is not updated anymore. Look in bzr... That explains it :) Works fine now, thank you. Magnus --------------------------------------------------- --------------------------------------------------- WE'VE CHANGED NAMES! Since January 1st 2010 Erlang Training and Consulting Ltd. has become ERLANG SOLUTIONS LTD. www.erlang-solutions.com ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-01-07 11:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <201001040514.o045E1Aq019172@godzilla.ics.uci.edu>
2009-12-16 17:12 ` bug#5232: 23.1.90; vc-hg-working-revision always gives latest revision in which file changed Magnus Henoch
2010-01-04 5:15 ` bug#5232: marked as done (23.1.90; vc-hg-working-revision always gives latest revision in which file changed) Emacs bug Tracking System
2010-01-06 15:22 ` bug#5232: 23.1.90; vc-hg-working-revision always gives latest revision in which file changed Magnus Henoch
2010-01-06 19:02 ` Dan Nicolaescu
2010-01-07 11:56 ` Magnus Henoch
Code repositories for project(s) associated with this external index https://git.savannah.gnu.org/cgit/emacs.git https://git.savannah.gnu.org/cgit/emacs/org-mode.git This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.