[or-cvs] r13960: Fix the SVK version detection logic to work right on a branc (in tor/branches/tor-0_2_0-patches: . src/or)

[nickm at seul.org]

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

Modified:
   tor/branches/tor-0_2_0-patches/
   tor/branches/tor-0_2_0-patches/ChangeLog
   tor/branches/tor-0_2_0-patches/src/or/Makefile.am
Log:
 r18729 at catbus:  nickm | 2008-03-11 00:44:53 -0400
 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/branches/tor-0_2_0-patches
___________________________________________________________________
 svk:merge ticket from /tor/020 [r18729] on 8246c3cf-6607-4228-993b-4d95d33730f1

Modified: tor/branches/tor-0_2_0-patches/ChangeLog
===================================================================
--- tor/branches/tor-0_2_0-patches/ChangeLog	2008-03-11 04:47:07 UTC (rev 13959)
+++ tor/branches/tor-0_2_0-patches/ChangeLog	2008-03-11 04:47:12 UTC (rev 13960)
@@ -10,6 +10,10 @@
       left BandwidthRate and BandwidthBurst at the default, we would be
       silently limited by those defaults. Now raise them to match the
       RelayBandwidth* values.
+    - 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.
 
 
 Changes in version 0.2.0.21-rc - 2008-03-02
@@ -23,8 +27,6 @@
     - We were sometimes miscounting the number of bytes read from the
       network, causing our rate limiting to not be followed exactly.
       Bugfix on 0.2.0.16-alpha. Reported by lodger.
-    - Generate "STATUS_SERVER" events rather than misspelled "STATUS_SEVER"
-      events.  Caught by mwenge; bugfix on 0.1.2.x.
 
   o Minor bugfixes:
     - Fix compilation with OpenSSL 0.9.8 and 0.9.8a.  All other supported

Modified: tor/branches/tor-0_2_0-patches/src/or/Makefile.am
===================================================================
--- tor/branches/tor-0_2_0-patches/src/or/Makefile.am	2008-03-11 04:47:07 UTC (rev 13959)
+++ tor/branches/tor-0_2_0-patches/src/or/Makefile.am	2008-03-11 04:47:12 UTC (rev 13960)
@@ -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						\