Do not warn about svn:mergeinfo, it is usually taken care about already by creating merge commits or cherry-pick commits

Vampire · tnyblom · commit 61ebde7a4111 · 2017-12-06T18:04:28.000+01:00
diff --git a/src/svn.cpp b/src/svn.cpp
@@ -1059,11 +1059,10 @@ int SvnRevision::fetchUnknownProps(apr_pool_t *pool, const char *key, svn_fs_roo
     const void *propKey;
     for (hi = apr_hash_first(pool, table); hi; hi = apr_hash_next(hi)) {
         apr_hash_this(hi, &propKey, NULL, &propVal);
-        if (strcmp((char*)propKey, "svn:ignore")!=0) {
+        if (strcmp((char*)propKey, "svn:ignore")!=0 && strcmp((char*)propKey, "svn:mergeinfo") !=0) {
             qWarning() << "WARN: Unknown svn-property" << (char*)propKey << "set to" << ((svn_string_t*)propVal)->data << "for" << key;
         }
     }
 
     return EXIT_SUCCESS;
 }
-

Original file line number	Diff line number	Diff line change
`@@ -1059,11 +1059,10 @@ int SvnRevision::fetchUnknownProps(apr_pool_t pool, const char key, svn_fs_roo`
`1059`	`1059`	`const void *propKey;`
`1060`	`1060`	`for (hi = apr_hash_first(pool, table); hi; hi = apr_hash_next(hi)) {`
`1061`	`1061`	`apr_hash_this(hi, &propKey, NULL, &propVal);`
`1062`		`- if (strcmp((char*)propKey, "svn:ignore")!=0) {`
	`1062`	`+ if (strcmp((char)propKey, "svn:ignore")!=0 && strcmp((char)propKey, "svn:mergeinfo") !=0) {`
`1063`	`1063`	`qWarning() << "WARN: Unknown svn-property" << (char)propKey << "set to" << ((svn_string_t)propVal)->data << "for" << key;`
`1064`	`1064`	`}`
`1065`	`1065`	`}`
`1066`	`1066`
`1067`	`1067`	`return EXIT_SUCCESS;`
`1068`	`1068`	`}`
`1069`		`-`