# # # patch "svn_import.cc" # from [f63ea89144da6aaf5b6d7be8eb662268f3dd71a2] # to [ad8de4297d049a5a472cd94c4eba1843e3ff7c81] # ============================================================ --- svn_import.cc f63ea89144da6aaf5b6d7be8eb662268f3dd71a2 +++ svn_import.cc ad8de4297d049a5a472cd94c4eba1843e3ff7c81 @@ -246,48 +246,48 @@ struct svn_dump_parser if (prop_content_length > 0) { - int prop_start = charpos; + int prop_start = charpos; - newline(); + newline(); - while (((int) charpos - prop_start) < prop_content_length) - { - int key_len, value_len; - string key, value; + while (((int) charpos - prop_start) < prop_content_length) + { + int key_len, value_len; + string key, value; - expect("K"); - num(key_len); - newline(); - eat_raw_data(key, key_len); - L(FL("key length: %d key: '%s'") % key_len % key); - newline(); - expect("V"); - num(value_len); - newline(); - eat_raw_data(value, value_len); - newline(); + expect("K"); + num(key_len); + newline(); + eat_raw_data(key, key_len); + L(FL("key length: %d key: '%s'") % key_len % key); + newline(); + expect("V"); + num(value_len); + newline(); + eat_raw_data(value, value_len); + newline(); - I(key.length() == key_len); - I(value.length() == value_len); + I(key.length() == key_len); + I(value.length() == value_len); - L(FL("key: '%s' value: '%s'") % key % value); - - if (strp() && (token == "PROPS-END")) - { - I((int) charpos > prop_start); - if (((int) charpos - prop_start) == prop_content_length) + L(FL("key: '%s' value: '%s'") % key % value); + + if (strp() && (token == "PROPS-END")) { - L(FL("warning: charpos - prop_start = %d") % (charpos - prop_start)); - L(FL(" prop_content_length = %d") % prop_content_length); + I((int) charpos > prop_start); + if (((int) charpos - prop_start) == prop_content_length) + { + L(FL("warning: charpos - prop_start = %d") % (charpos - prop_start)); + L(FL(" prop_content_length = %d") % prop_content_length); + } + break; } - break; } - } - expect("PROPS-END"); + expect("PROPS-END"); - while (newlinep()) - eat(TOK_NEWLINE); + while (newlinep()) + eat(TOK_NEWLINE); } if (text_content_length > 0)