annotate etc/schema/dbstart.rnc @ 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 |
38f93f3d00a2 |
children |
|
rev |
line source |
86361
|
1 # This choice of root elements comes from the 1.0b1 RNG schema at
|
|
2 # http://www.oasis-open.org/docbook/relaxng/1.0b1/index.shtml
|
|
3
|
|
4 start =
|
|
5 set
|
|
6 | setindex
|
|
7 | book
|
|
8 | part
|
|
9 | reference
|
|
10 | preface
|
|
11 | chapter
|
|
12 | appendix
|
|
13 | article
|
|
14 | bibliography
|
|
15 | glossary
|
|
16 | index
|
|
17 | refentry
|
|
18 | sect1
|
|
19 | sect2
|
|
20 | sect3
|
|
21 | sect4
|
|
22 | sect5
|
|
23 | section
|