r18730@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.


svn:r13959

ChangeLog

@@ -9,6 +9,8 @@ Changes in version 0.2.1.1-alpha - 2008-??-??
       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

src/or/Makefile.am

@@ -74,7 +74,8 @@ micro-revision.i: FORCE
 	      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						\