Ignore:
Timestamp:
Aug 7, 2010, 4:31:18 PM (11 years ago)
Author:
Peter Johansson
Message:

allow config file to override svn property (fixes #326). Adding two new files (split.h and split.cc) from yat.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/SVNproperty.cc

    r1144 r1152  
    4040    const Configuration& config = Configuration::instance();
    4141    typedef std::map<std::string, std::string> str_map;
    42     const str_map* props = config.svn_properties(file_name(path));
    43     std::map<std::string, std::string>::const_iterator i;
    44     std::map<std::string, std::string>::const_iterator e;
    45     if (props) {
    46       i = props->begin();
    47       e = props->end();
    48       // we can not use map::insert because we want config to have precedence
    49       for ( ; i!=e; ++i)
    50         property_[i->first] = i->second;
    51     }
     42    const str_map& props = config.svn_properties(file_name(path));
     43    std::map<std::string, std::string>::const_iterator i = props.begin();
     44    std::map<std::string, std::string>::const_iterator e = props.end();
     45    // we can not use map::insert because we want config to have precedence
     46    for ( ; i!=e; ++i)
     47      property_[i->first] = i->second;
    5248   
    5349    i = property_.begin();
Note: See TracChangeset for help on using the changeset viewer.