emacs: autogen.sh annotate

annotate autogen.sh @ 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	7b9e6639caa3
children

rev	line source
48482 15eaa1a21c1c * autogen.sh: New file. Karl Fogel <kfogel@red-bean.com> parents: diff changeset	1 #!/bin/sh
15eaa1a21c1c * autogen.sh: New file. Karl Fogel <kfogel@red-bean.com> parents: diff changeset	2
106652 7b9e6639caa3 * INSTALL.BZR: Rename from INSTALL.CVS, edit to talk about Bazaar. Karl Fogel <kfogel@red-bean.com> parents: 55111 diff changeset	3 echo "Please read INSTALL.BZR for instructions on how to build Emacs from Bazaar."
48482 15eaa1a21c1c * autogen.sh: New file. Karl Fogel <kfogel@red-bean.com> parents: diff changeset	4
15eaa1a21c1c * autogen.sh: New file. Karl Fogel <kfogel@red-bean.com> parents: diff changeset	5 # Exit with failure, since people may have generic build scripts that
15eaa1a21c1c * autogen.sh: New file. Karl Fogel <kfogel@red-bean.com> parents: diff changeset	6 # try things like "autogen.sh && ./configure && make".
15eaa1a21c1c * autogen.sh: New file. Karl Fogel <kfogel@red-bean.com> parents: diff changeset	7 exit 1
52401 695cf19ef79e Add arch taglines Miles Bader <miles@gnu.org> parents: 48482 diff changeset	8
695cf19ef79e Add arch taglines Miles Bader <miles@gnu.org> parents: 48482 diff changeset	9 # arch-tag: a123408c-fada-4bf7-98a0-a786cff918f0

Mercurial > emacs

annotate autogen.sh @ 111679:33ed3cf8260b