[or-cvs] r13959: Forward-port: Fix the SVK version detection logic to work ri (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2008-03-11 00:47:07 -0400 (Tue, 11 Mar 2008)
New Revision: 13959

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/Makefile.am
Log:
 r18730 at catbus:  nickm | 2008-03-11 00:47:04 -0400
 Forward-port: Fix the SVK version detection logic to work right on a branch: tolerate multiple "copied from" tags and only look at the first.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r18730] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-03-11 04:30:22 UTC (rev 13958)
+++ tor/trunk/ChangeLog	2008-03-11 04:47:07 UTC (rev 13959)
@@ -9,6 +9,8 @@
       Bugfix on 0.2.0.20-rc.
     - Generate "STATUS_SERVER" events rather than misspelled "STATUS_SEVER"
       events.  Caught by mwenge; bugfix on 0.1.2.x.
+    - Fix the SVK version detection logic to work correctly on a branch.
+      Bugfix on 0.2.0.x.
 
   o Minor features:
     - Allow separate log levels to be configured for different logging

Modified: tor/trunk/src/or/Makefile.am
===================================================================
--- tor/trunk/src/or/Makefile.am	2008-03-11 04:30:22 UTC (rev 13958)
+++ tor/trunk/src/or/Makefile.am	2008-03-11 04:47:07 UTC (rev 13959)
@@ -74,7 +74,8 @@
 	      break;						\
 	    else						\
 	      loc=`svk info $$location |			\
-		sed -n 's/^Copied From: \(.*\), Rev\. [0-9][0-9]*/\1/p'`; \
+		sed -n 's/^Copied From: \(.*\), Rev\. [0-9][0-9]*/\1/p' | \
+	        head -1`;					\
 	      if test x$$loc = x; then				\
 		break;						\
 	      else						\