Mercurial > emacs
view src/pre-crt0.c @ 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 | 695cf19ef79e |
children | 375f2633d815 ef719132ddfa |
line wrap: on
line source
/* This file is loaded before crt0.o on machines where we do not remap part of the data space into text space in unexec. On these machines, there is no problem with standard crt0.o's that make environ an initialized variable. However, we do need to make sure the label data_start exists anyway. */ /* Create a label to appear at the beginning of data space. */ int data_start = 0; /* arch-tag: 2e260272-0790-495f-9362-55abd56b5c5a (do not change this comment) */