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


svn:r13960

2 files changed, 6 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index e80d89b61b..fb0d701cdb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,10 @@ Changes in version 0.2.0.22-rc - 2008-03-??
       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 @@ Changes in version 0.2.0.21-rc - 2008-03-02
     - 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
diff --git a/src/or/Makefile.am b/src/or/Makefile.am
index 9efe220636..4621ba9d26 100644
--- a/src/or/Makefile.am
+++ b/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						\