annotate vpath.sed @ 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 |
rev |
line source |
4703
|
1 /^VPATH *=/c\
|
|
2 # This works only in GNU make. Using the patterns avoids\
|
|
3 # object files being found by VPATH, and thus permits building\
|
|
4 # when $srcdir is configured itself.\
|
|
5 vpath %.c $(srcdir)\
|
|
6 vpath %.h $(srcdir)\
|
|
7 \
|
52401
|
8
|
|
9 # arch-tag: 56a64b50-e4e8-443a-960f-f13af0f1a545
|