Re: [Emacs-diffs] trunk r117980: Merge from emacs-24; up to r117522.

[Stefan Monnier]

> I had no indication that this would not include the merge information.

Indeed, "bzr merge --help" is carefully silent about this side-effect :-(

Sadly, the only DVCS which knew how to keep track of partial (aka
cherry-picked) merges were DaRCS and Arch, AFAIK.

> I'm sorry for the trouble I caused. Please feel free to revert and fix
> as you see fit.

No, we'll just deal with the spurious conflicts when we do the merge.

> I promise not to run a bzr command ever again :-).

FWIW, Git suffers from the same problem, AFAIK.  Tho maybe Git has found
a clever way to handle them OK in practice, even though it doesn't
actually keep track of them either (along the lines of what it does for
file renames).


        Stefan


> Stefan Monnier <address@hidden> wrote:

>> Hi Bill,
>> 
>> Don't do this.  Your commit says you "merged" but the metadata says
>> you didn't.  You just duplicated the changes that you previously
>> installed on emacs-24.  So that'll just create spurious conflicts when
>> we do merge the emacs-24 changes into trunk.
>> 
>> You can merge things from emacs-24 to trunk if you want (and we always
>> welcome people to do that, so that we don't have to), but you have to do
>> it with a plain "bzr merge" or with "M-x bzrmerge" (from
>> emacs/admin/bzrmerge.el), the latter being a more clever version of the
>> former which knows about some of our coding conventions.
>> 
>> 
>> Stefan
>> 
>> 
>> >>>>> "Bill" == Bill Wohler <address@hidden> writes:
>> 
>> > ------------------------------------------------------------
>> > revno: 117980
>> > revision-id: address@hidden
>> > parent: address@hidden
>> > committer: Bill Wohler <address@hidden>
>> > branch nick: trunk
>> > timestamp: Mon 2014-09-29 22:06:42 -0700
>> > message:
>> >   Merge from emacs-24; up to r117522.
>> > modified:
>> >   etc/MH-E-NEWS                  
>> > mhenews-20091113204419-o5vbwnq5f7feedwu-1489
>> >   etc/NEWS                       news-20100311060928-aoit31wvzf25yr1z-1
>> >   lisp/mh-e/ChangeLog            
>> > changelog-20091113204419-o5vbwnq5f7feedwu-2547
>> >   lisp/mh-e/mh-comp.el           
>> > mhcomp.el-20091113204419-o5vbwnq5f7feedwu-2532
>> >   lisp/mh-e/mh-e.el              
>> > mhe.el-20091113204419-o5vbwnq5f7feedwu-2534
>> 
>> > === modified file 'etc/MH-E-NEWS'
>> > --- a/etc/MH-E-NEWS        2014-01-16 06:24:06 +0000
>> > +++ b/etc/MH-E-NEWS        2014-09-30 05:06:42 +0000
>> > @@ -3,6 +3,28 @@
>> >  Copyright (C) 2001-2014 Free Software Foundation, Inc.
>> >  See the end of the file for license conditions.
>> 
>> > +* Changes in MH-E 8.6
>> > +
>> > +Version 8.6 fixes composition errors in nmh 1.6.
>> > +
>> > +** Bug Fixes in MH-E 8.6
>> > +
>> > +*** Add support for nmh 1.5
>> > +
>> > +A components file is now generated that works with nmh 1.5 (partially
>> > +closes SF #468).
>> > +  
>> > +*** Error if mh-x-face-file is nil
>> > +
>> > +Ensure that `mh-x-face-file' is a string before trying to use it
>> > +(closes SF #474).
>> > +
>> > +*** MH-Folder buffer includes "scan: bad message list unseen"
>> > +
>> > +Fix this error (closes SF #471).
>> > +
>> > +
>> > +
>> >  * Changes in MH-E 8.5
>> 
>> >  Version 8.5 fixes bugs when incorporating or forwarding mail.
>> 
>> > === modified file 'etc/NEWS'
>> > --- a/etc/NEWS     2014-09-29 18:14:08 +0000
>> > +++ b/etc/NEWS     2014-09-30 05:06:42 +0000
>> > @@ -918,7 +918,7 @@
>> 
>> >  *** Recognition and better indentation of continuations in array 
>> > comprehensions.
>> 
>> > -** MH-E has been updated to version 8.5 - see separate MH-E-NEWS file.
>> > +** MH-E has been updated to version 8.6 - see separate MH-E-NEWS file.
>> 
>> >  ** Octave mode
>> 
>> 
>> > === modified file 'lisp/mh-e/ChangeLog'
>> > --- a/lisp/mh-e/ChangeLog  2014-05-09 07:02:00 +0000
>> > +++ b/lisp/mh-e/ChangeLog  2014-09-30 05:06:42 +0000
>> > @@ -1,3 +1,21 @@
>> > +2014-09-30  Bill Wohler    <address@hidden>
>> > +
>> > +  Release MH-E version 8.6.
>> > +
>> > +  * mh-e.el (Version, mh-version): Update for release 8.6.
>> > +
>> > +2014-09-30  Mike Kupfer  <address@hidden>
>> > +
>> > +  * mh-comp.el (mh-insert-x-face): Ensure that mh-x-face-file is a
>> > +  string before trying to use it (closes SF #474).
>> > +  (mh-bare-components): New function to create a temporary initial
>> > +  components file; replaces mh-find-components. Improve the temp
>> > +  folder and file names as per a suggestion from Bill Wohler. Also
>> > +  address XEmacs compatibility issues: use mm-make-temp-file instead
>> > +  of make-temp-file, and only pass one argument to delete-directory.
>> > +  (mh-edit-again, mh-send-sub): Use mh-bare-components instead of
>> > +  mh-find-components (partially closes SF #468).
>> > +
>> >  2014-05-09  Glenn Morris  <address@hidden>
>> 
>> >    * mh-e.el (mh-variants): Use file-accessible-directory-p.
>> 
>> > === modified file 'lisp/mh-e/mh-comp.el'
>> > --- a/lisp/mh-e/mh-comp.el 2014-01-01 07:43:34 +0000
>> > +++ b/lisp/mh-e/mh-comp.el 2014-09-30 05:06:42 +0000
>> > @@ -411,6 +411,7 @@
>> >    (interactive (list (mh-get-msg-num t)))
>> >    (let* ((from-folder mh-current-folder)
>> >           (config (current-window-configuration))
>> > +         (components-file (mh-bare-components))
>> >           (draft
>> >            (cond ((and mh-draft-folder (equal from-folder mh-draft-folder))
>> >                   (pop-to-buffer (find-file-noselect (mh-msg-filename 
>> > message))
>> > @@ -467,7 +468,8 @@
>> >             ;; Text field, that's an easy case
>> >             (t
>> >              (mh-modify-header-field field value))))))
>> > -     (mh-components-to-list (mh-find-components)))
>> > +     (mh-components-to-list components-file))
>> > +    (delete-file components-file)
>> >      (goto-char (point-min))
>> >      (save-buffer)
>> >      (mh-compose-and-send-mail
>> > @@ -885,22 +887,6 @@
>> >            (t
>> >             nil))))
>> 
>> > -(defun mh-find-components ()
>> > -  "Return the path to the components file."
>> > -  (let (components)
>> > -    (cond
>> > -     ((file-exists-p
>> > -       (setq components
>> > -             (expand-file-name mh-comp-formfile mh-user-path)))
>> > -      components)
>> > -     ((file-exists-p
>> > -       (setq components
>> > -             (expand-file-name mh-comp-formfile mh-lib)))
>> > -      components)
>> > -     (t
>> > -      (error "Can't find %s in %s or %s"
>> > -             mh-comp-formfile mh-user-path mh-lib)))))
>> > -
>> >  (defun mh-send-sub (to cc subject config)
>> >    "Do the real work of composing and sending a letter.
>> >  Expects the TO, CC, and SUBJECT fields as arguments.
>> > @@ -910,8 +896,8 @@
>> >      (message "Composing a message...")
>> >      (let ((draft (mh-read-draft
>> >                    "message"
>> > -                  (mh-find-components)
>> > -                  nil)))
>> > +                  (mh-bare-components)
>> > +                  t)))
>> >        (mh-insert-fields "To:" to "Subject:" subject "Cc:" cc)
>> >        (goto-char (point-max))
>> >        (mh-compose-and-send-mail draft "" folder msg-num
>> > @@ -920,6 +906,29 @@
>> >        (mh-letter-mode-message)
>> >        (mh-letter-adjust-point))))
>> 
>> > +(defun mh-bare-components ()
>> > +  "Generate a temporary, clean components file and return its path."
>> > +  ;; Let comp(1) create the skeleton for us.  This is particularly
>> > +  ;; important with nmh-1.5, because its default "components" needs
>> > +  ;; some processing before it can be used.  Unfortunately, comp(1)
>> > +  ;; doesn't have a -build option.  So, to avoid the possibility of
>> > +  ;; clobbering an existing draft, create a temporary directory and
>> > +  ;; use it as the drafts folder.  Then copy the skeleton to a regular
>> > +  ;; temp file, and return the regular temp file.
>> > +  (let (new
>> > +        (temp-folder (mm-make-temp-file
>> > +                      (concat mh-user-path "draftfolder.") t)))
>> > +    (mh-exec-cmd "comp" "-nowhatnowproc"
>> > +                 "-draftfolder" (format "+%s"
>> > +                                        (file-name-nondirectory 
>> > temp-folder))
>> > +                 (if (stringp mh-comp-formfile)
>> > +                     (list "-form" mh-comp-formfile)))
>> > +    (setq new (mm-make-temp-file "comp."))
>> > +    (rename-file (concat temp-folder "/" "1") new t)
>> > +    (delete-file (concat temp-folder "/" ".mh_sequences"))
>> > +    (delete-directory temp-folder)
>> > +    new))
>> > +
>> >  (defun mh-read-draft (use initial-contents delete-contents-file)
>> >    "Read draft file into a draft buffer and make that buffer the current 
>> > one.
>> 
>> > @@ -1069,7 +1078,8 @@
>> >  (defun mh-insert-x-face ()
>> >    "Append X-Face, Face or X-Image-URL field to header.
>> >  If the field already exists, this function does nothing."
>> > -  (when (and (file-exists-p mh-x-face-file)
>> > +  (when (and (stringp mh-x-face-file)
>> > +             (file-exists-p mh-x-face-file)
>> >               (file-readable-p mh-x-face-file))
>> >      (save-excursion
>> >        (unless (or (mh-position-on-field "X-Face")
>> 
>> > === modified file 'lisp/mh-e/mh-e.el'
>> > --- a/lisp/mh-e/mh-e.el    2014-05-09 07:02:00 +0000
>> > +++ b/lisp/mh-e/mh-e.el    2014-09-30 05:06:42 +0000
>> > @@ -5,7 +5,7 @@
>> 
>> >  ;; Author: Bill Wohler <address@hidden>
>> >  ;; Maintainer: Bill Wohler <address@hidden>
>> > -;; Version: 8.5+bzr
>> > +;; Version: 8.6
>> >  ;; Keywords: mail
>> 
>> >  ;; This file is part of GNU Emacs.
>> > @@ -127,7 +127,7 @@
>> >  ;; Try to keep variables local to a single file. Provide accessors if
>> >  ;; variables are shared. Use this section as a last resort.
>> 
>> > -(defconst mh-version "8.5+bzr" "Version number of MH-E.")
>> > +(defconst mh-version "8.6" "Version number of MH-E.")
>> 
>> >  ;; Variants
>> 
>> 
>> > _______________________________________________
>> > Emacs-diffs mailing list
>> > address@hidden
>> > https://lists.gnu.org/mailman/listinfo/emacs-diffs

> -- 
> Bill Wohler <address@hidden> aka <address@hidden>
> http://www.newt.com/wohler/
> GnuPG ID:610BD9AD