[svnbook commit] r1463 - trunk/src/nb
sunny256
svnbook-dev at red-bean.com
Fri Jun 17 12:35:38 CDT 2005
Author: sunny256
Date: Fri Jun 17 12:35:37 2005
New Revision: 1463
Modified:
trunk/src/nb/Makefile
Log:
Norwegian svnbook: Make it possible to sync against the English bok up
to a specific revision number by using "make sync HEAD=revnum".
* src/nb/Makefile
(sync): If the HEAD variable is not empty, write that value to HEADREV
instead of the actual HEAD revision.
Modified: trunk/src/nb/Makefile
==============================================================================
--- trunk/src/nb/Makefile (original)
+++ trunk/src/nb/Makefile Fri Jun 17 12:35:37 2005
@@ -74,7 +74,12 @@
@echo ======== END svn status ========
@echo If there are no local changes, press ENTER...
@read
- svnversion . >HEADREV
+ if [ "$(HEAD)" = "" ]; then \
+ svnversion . >HEADREV; \
+ else \
+ echo $(HEAD) >HEADREV; \
+ echo "Note: Merging up to r$(HEAD) instead of actual repository HEAD"; \
+ fi;
$(MAKE) editmode
svn merge -r$$(cat LAST_UPDATED):$$(cat HEADREV) $(COLLAB)/trunk/src/en .
mv HEADREV LAST_UPDATED
More information about the svnbook-dev
mailing list