[svnbook commit] r1126 - trunk/src/nb
sunny256 at red-bean.com
sunny256 at red-bean.com
Sat Feb 26 05:32:31 CST 2005
Author: sunny256
Date: Sat Feb 26 05:32:30 2005
New Revision: 1126
Modified:
trunk/src/nb/Makefile
Log:
Norwegian svnbook: Remove merge command in "make sync" for the
src/nb/tools directory, it contains only a syntax file for Vim.
* src/nb/Makefile
(sync): Delete "svn merge" command which was added in r1117.
Modified: trunk/src/nb/Makefile
==============================================================================
--- trunk/src/nb/Makefile (original)
+++ trunk/src/nb/Makefile Sat Feb 26 05:32:30 2005
@@ -204,7 +204,6 @@
svnversion . >HEADREV
$(MAKE) editmode
svn merge -r$$(cat LAST_UPDATED):$$(cat HEADREV) $(COLLAB)/trunk/src/en .
- svn merge -r$$(cat LAST_UPDATED):$$(cat HEADREV) $(COLLAB)/trunk/src/tools tools
mv HEADREV LAST_UPDATED
rmdir sync.LOCK
More information about the svnbook-dev
mailing list