Changeset 1608 for trunk


Ignore:
Timestamp:
Jul 14, 2020, 2:40:18 AM (11 months ago)
Author:
Peter Johansson
Message:

merge recent changes from 0.10-stable branch into trunk

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/.release_year

    r1564 r1608  
    1 2015
     12020
  • trunk/lib/SVNproperty.cc

    r1515 r1608  
    44  Copyright (C) 2006 Jari Häkkinen
    55  Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
    6   Copyright (C) 2010, 2011, 2012 Peter Johansson
     6  Copyright (C) 2010, 2011, 2012, 2020 Peter Johansson
    77
    88  This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    9898      std::string first;
    9999      getline(ss2, first, '-');
     100      bool found_dash = word.size()>first.size() && word[first.size()]=='-';
    100101      trim(first);
    101102      std::string second;
    102       bool found_dash = getline(ss2, second);
     103      getline(ss2, second);
    103104      trim(second);
    104105      yat::utility::Segment<svn_revnum_t> rev_interval;
  • trunk/m4/version.m4

  • trunk/test/Makefile.am

    r1599 r1608  
    8383
    8484## graph test needs to link against Graph class
    85 test_graph_test_LDADD = $(LDADD) lib/libsvndigest.a
     85test_graph_test_LDADD = test/libsvndigesttest.a \
     86  lib/libsvndigest.a lib/libsvndigest_core.a yat/libyat.a \
     87  $(SVN_LIBS) $(APR_LIBS) $(PLPLOT_LIBS)
    8688
    8789test_libsvndigesttest_a_SOURCES = test/Suite.cc
  • trunk/test/repo_status_test.sh

    r1532 r1608  
    3535# check if the last test revision is a part of the svndigest repository
    3636status_return=`$SVN status -v ${repo}/db/revs/$rev`
     37echo "status_return:$status_return"
    3738# logic: (file does not exist) || (file exists but not in revision control)
    38 if [[ ${#status_return} -eq 0 || ${status_return:0:1} = "?" ]]; then
     39if test x"${status_return}" = x"" || echo "${status_return}" | $GREP -q '^?'; then
    3940    repository_status=0
    4041    echo "ERROR: test repository and svndigest repository are not synchronized:"
     
    5051# repository is found, or break the test repository revision 0 is
    5152# reached.
    52 while [[ ${#status_return} -eq 0 || ${status_return:0:1} = "?" ]] && [ $rev -ge 0 ]; do
     53while {test x"${status_return}" = x"" || echo "${status_return}" | $GREP -q '^?'} && test $rev -ge 0; do
    5354    echo "ERROR:    svn add test/repo/db/revs/$rev test/repo/db/revprops/$rev"
    5455    let rev--
Note: See TracChangeset for help on using the changeset viewer.