summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2016-05-03 18:06:42 +0000
committerdim <dim@FreeBSD.org>2016-05-03 18:06:42 +0000
commit7bece82c0db4fadd93596fa7b3502ae06ac5fc27 (patch)
treedb68d724be4b499cf92e1cab2a497a795cd0a52f
parentd9c9113377a2f19d01848ae8dcc470e9306ce932 (diff)
downloadFreeBSD-src-7bece82c0db4fadd93596fa7b3502ae06ac5fc27.zip
FreeBSD-src-7bece82c0db4fadd93596fa7b3502ae06ac5fc27.tar.gz
Re-sync the FreeBSD-specific Subversion template with the one from
ports. MFC after: 11 days X-MFC-With: r298845
-rw-r--r--contrib/subversion/subversion/svn/util.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/contrib/subversion/subversion/svn/util.c b/contrib/subversion/subversion/svn/util.c
index 1b6ec2f..fb017e9 100644
--- a/contrib/subversion/subversion/svn/util.c
+++ b/contrib/subversion/subversion/svn/util.c
@@ -343,6 +343,7 @@ truncate_buffer_at_prefix(apr_size_t *new_len,
static const char *prefixes[] = {
"PR:",
"Submitted by:",
+ "Reported by:",
"Reviewed by:",
"Approved by:",
"Obtained from:",
@@ -420,6 +421,7 @@ svn_cl__get_log_message(const char **log_msg,
svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
svn_stringbuf_appendcstr(default_msg, "PR:\t\t" APR_EOL_STR);
svn_stringbuf_appendcstr(default_msg, "Submitted by:\t" APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "Reported by:\t" APR_EOL_STR);
svn_stringbuf_appendcstr(default_msg, "Reviewed by:\t" APR_EOL_STR);
svn_stringbuf_appendcstr(default_msg, "Approved by:\t" APR_EOL_STR);
svn_stringbuf_appendcstr(default_msg, "Obtained from:\t" APR_EOL_STR);
@@ -445,8 +447,9 @@ svn_cl__get_log_message(const char **log_msg,
svn_stringbuf_appendcstr(default_msg, EDITOR_EOF_PREFIX);
svn_stringbuf_appendcstr(default_msg, APR_EOL_STR);
svn_stringbuf_appendcstr(default_msg, "> Description of fields to fill in above: 76 columns --|" APR_EOL_STR);
- svn_stringbuf_appendcstr(default_msg, "> PR: If a GNATS PR is affected by the change." APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "> PR: If and which Problem Report is related." APR_EOL_STR);
svn_stringbuf_appendcstr(default_msg, "> Submitted by: If someone else sent in the change." APR_EOL_STR);
+ svn_stringbuf_appendcstr(default_msg, "> Reported by: If someone else reported the issue." APR_EOL_STR);
svn_stringbuf_appendcstr(default_msg, "> Reviewed by: If someone else reviewed your modification." APR_EOL_STR);
svn_stringbuf_appendcstr(default_msg, "> Approved by: If you needed approval for this commit." APR_EOL_STR);
svn_stringbuf_appendcstr(default_msg, "> Obtained from: If the change is from a third party." APR_EOL_STR);
OpenPOWER on IntegriCloud