[svnbook commit] r2766 - trunk/src/nb

[sunny256]

Author: sunny256
Date: Thu Mar 29 04:54:40 2007
New Revision: 2766

Log:
Rename src/nb/LAST_UPDATED to src/nb/LAST_SYNC, which is more correct.

* src/nb/LAST_UPDATED
  Renamed from this...

* src/nb/LAST_SYNC
  ...to this.

* src/nb/METHOD
* src/nb/Makefile
* src/nb/TRANSLATION-STATUS
  Change all LAST_UPDATED to LAST_SYNC.


Added:
   trunk/src/nb/LAST_SYNC
      - copied unchanged from r2765, /trunk/src/nb/LAST_UPDATED
Removed:
   trunk/src/nb/LAST_UPDATED
Modified:
   trunk/src/nb/METHOD
   trunk/src/nb/Makefile
   trunk/src/nb/TRANSLATION-STATUS

Modified: trunk/src/nb/METHOD
==============================================================================
--- trunk/src/nb/METHOD	(original)
+++ trunk/src/nb/METHOD	Thu Mar 29 04:54:40 2007
@@ -189,7 +189,7 @@
 steps. Let’s say that a file rename happens in r1000 and there are lots 
 of file changes before and after this rename. What you can do, is to 
 first merge in all the changes from when the last synchronisation was 
-done (stored in the LAST_UPDATED file) up to r999, and then take the 
+done (stored in the LAST_SYNC file) up to r999, and then take the 
 following merges in decent steps:
 
   make sync HEAD=999

Modified: trunk/src/nb/Makefile
==============================================================================
--- trunk/src/nb/Makefile	(original)
+++ trunk/src/nb/Makefile	Thu Mar 29 04:54:40 2007
@@ -93,11 +93,11 @@
 
 engdir:
 	@if [ -d book/eng ]; then \
-		svn up -r`cat LAST_UPDATED` book/eng; \
+		svn up -r`cat LAST_SYNC` book/eng; \
 	else \
 		: Temporary change while the ora-2e-reorg sync goes on. \
-		: svn co -r`cat LAST_UPDATED` $(COLLAB)/trunk/src/en/book book/eng; \
-		svn co -r`cat LAST_UPDATED` $(COLLAB)/branches/ora-2e-reorg/src/en/book at 2597 book/eng; \
+		: svn co -r`cat LAST_SYNC` $(COLLAB)/trunk/src/en/book book/eng; \
+		svn co -r`cat LAST_SYNC` $(COLLAB)/branches/ora-2e-reorg/src/en/book at 2597 book/eng; \
 	fi
 
 sync:
@@ -115,8 +115,8 @@
 		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
+	svn merge -r$$(cat LAST_SYNC):$$(cat HEADREV) $(COLLAB)/trunk/src/en .
+	mv HEADREV LAST_SYNC
 	$(MAKE) commitmode
 	rmdir sync.LOCK
 

Modified: trunk/src/nb/TRANSLATION-STATUS
==============================================================================
--- trunk/src/nb/TRANSLATION-STATUS	(original)
+++ trunk/src/nb/TRANSLATION-STATUS	Thu Mar 29 04:54:40 2007
@@ -5,7 +5,7 @@
 1. Synchronisation history against the English version
 
   The revision number for the last synchronisation is stored in the 
-  LAST_UPDATED file.
+  LAST_SYNC file.
 
 2. File status