view admin/notes/changelogs @ 111679:33ed3cf8260b

Initial support for unified DVCS pull and merge. * lisp/vc/vc-bzr.el (vc-bzr-admin-branchconf, vc-bzr-history): New vars. (vc-bzr--branch-conf, vc-bzr-async-command, vc-bzr-pull) (vc-bzr-merge-branch): New functions, implementing merge-branch and pull operations. * lisp/vc/vc.el (vc-merge): Use vc-BACKEND-merge-branch if available. Accept optional prefix arg meaning to prompt for a command. (vc-update): Use vc-BACKEND-pull if available. Accept optional prefix arg meaning to prompt for a command. (vc-pull): Alias for vc-update.
author Chong Yidong <cyd@stupidchicken.com>
date Mon, 22 Nov 2010 20:15:08 -0500
parents 4b9bb9aba3c8
children
line wrap: on
line source

http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00793.html
  There is no need to make change log entries for files such as NEWS,
  MAINTAINERS, and FOR-RELEASE.

http://lists.gnu.org/archive/html/emacs-devel/2006-12/msg01135.html
  There is no need to indicate regeneration of files such as configure
  in ChangeLog.


http://lists.gnu.org/archive/html/emacs-devel/2008-11/msg00940.html
Preferred form for several entries with the same content:

   * help.el (view-lossage):
   * kmacro.el (kmacro-edit-lossage):
   * edmacro.el (edit-kbd-macro): Fix docstring, lossage is now 300 keys.

(Rather than anything involving "ditto" and suchlike.)