Mercurial > emacs
view admin/make-changelog-diff @ 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 | 3e136d0943a4 |
children | 52a7f3f50b89 ef719132ddfa |
line wrap: on
line source
#! /bin/bash ## Author: Francesco Potorti` <pot@gnu.org> if [ $# -ne 2 ]; then echo "usage: $0 TAG1 TAG2" >&2 exit 1 fi if [ ! -f INSTALL -o ! -f configure -o ! -d lib-src ]; then echo "this script should be run in the emacs root directory" >&2 exit 2 fi cvs -q diff -b -r $1 -r $2 $(find -name ChangeLog|sort) | sed -n -e 's/^=\+/======/p' -e 's/^> //p' -e 's/^diff.*//p' \ -e 's/^RCS file: .cvsroot.emacs.emacs.\(.*\),v/\1/p' | sed -n -e "/^======$/ { N N h d } H s/.*// x s/^\n// p" # arch-tag: 7604a259-40b4-4f97-86b2-496a9c546f0a