diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/or/Makefile.am | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -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 diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 9efe220636..9654eab04d 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 \ |