FreeBSD Bugzilla – Attachment 149689 Details for
Bug 195252
devel/subversion: add Reported by field
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for devel/subversion17
s17.diff (text/plain), 5.97 KB, created by
Jason Helfman
on 2014-11-21 20:33:06 UTC
(
hide
)
Description:
patch for devel/subversion17
Filename:
MIME Type:
Creator:
Jason Helfman
Created:
2014-11-21 20:33:06 UTC
Size:
5.97 KB
patch
obsolete
>Index: Makefile.common >=================================================================== >--- Makefile.common (revision 373008) >+++ Makefile.common (working copy) >@@ -3,7 +3,7 @@ > > PORTNAME= subversion > PORTVERSION= 1.7.18 >-PORTREVISION?= 0 >+PORTREVISION?= 1 > CATEGORIES+= devel > MASTER_SITES= ${MASTER_SITE_APACHE} > DIST_SUBDIR= subversion17 >Index: files/extra-patch-fbsd-template >=================================================================== >--- files/extra-patch-fbsd-template (revision 373008) >+++ files/extra-patch-fbsd-template (working copy) >@@ -1,8 +1,8 @@ >---- ./subversion/svn/util.c.orig 2011-10-20 16:01:47.000000000 +0200 >-+++ ./subversion/svn/util.c 2014-04-11 19:04:14.000000000 +0200 >-@@ -63,6 +63,9 @@ >- #include "private/svn_opt_private.h" >+--- subversion/svn/util.c.orig 2014-03-20 14:29:13.887966536 -0400 >++++ subversion/svn/util.c 2014-03-20 14:29:53.806964066 -0400 >+@@ -66,6 +66,9 @@ > #include "private/svn_client_private.h" >+ #include "private/svn_cmdline_private.h" > #include "private/svn_string_private.h" > +#ifdef HAS_ORGANIZATION_NAME > +#include "freebsd-organization.h" >@@ -10,7 +10,7 @@ > > > >-@@ -682,6 +685,69 @@ >+@@ -322,6 +325,71 @@ > } > > >@@ -22,7 +22,9 @@ > + > +static const char *prefixes[] = { > + "PR:", >++ "Differential Revision:", > + "Submitted by:", >++ "Reported by:", > + "Reviewed by:", > + "Approved by:", > + "Obtained from:", >@@ -80,14 +82,16 @@ > #define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--") > > svn_error_t * >-@@ -697,8 +763,36 @@ >+@@ -337,8 +403,40 @@ > > /* Set default message. */ > default_msg = svn_stringbuf_create(APR_EOL_STR, pool); > + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); > + svn_stringbuf_appendcstr(default_msg, "PR:\t\t" APR_EOL_STR); >++ svn_stringbuf_appendcstr(default_msg, "Differential Revision:\t" APR_EOL_STR); > + svn_stringbuf_appendcstr(default_msg, "Submitted by:\t" APR_EOL_STR); > + svn_stringbuf_appendcstr(default_msg, "Reviewed by:\t" APR_EOL_STR); >++ svn_stringbuf_appendcstr(default_msg, "Reported 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); > + svn_stringbuf_appendcstr(default_msg, "MFC after:\t" APR_EOL_STR); >@@ -103,22 +107,24 @@ > - svn_stringbuf_appendcstr(default_msg, APR_EOL_STR APR_EOL_STR); > + 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, "> Submitted by: If someone else sent in the change." 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); >-+ svn_stringbuf_appendcstr(default_msg, "> MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email." APR_EOL_STR); >-+ svn_stringbuf_appendcstr(default_msg, "> MFH: Ports tree branch name. Request approval for merge." APR_EOL_STR); >-+ svn_stringbuf_appendcstr(default_msg, "> Relnotes: Set to 'yes' for mention in release notes." APR_EOL_STR); >-+ svn_stringbuf_appendcstr(default_msg, "> Security: Vulnerability reference (one per line) or description." APR_EOL_STR); >-+ svn_stringbuf_appendcstr(default_msg, "> Sponsored by: If the change was sponsored by an organization." 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, "> Differential Revision: https://reviews.freebsd.org/D### (*full* phabric URL needed)." 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); >++ svn_stringbuf_appendcstr(default_msg, "> MFC after: N [day[s]|week[s]|month[s]]. Request a reminder email." APR_EOL_STR); >++ svn_stringbuf_appendcstr(default_msg, "> MFH: Ports tree branch name. Request approval for merge." APR_EOL_STR); >++ svn_stringbuf_appendcstr(default_msg, "> Relnotes: Set to 'yes' for mention in release notes." APR_EOL_STR); >++ svn_stringbuf_appendcstr(default_msg, "> Security: Vulnerability reference (one per line) or description." APR_EOL_STR); >++ svn_stringbuf_appendcstr(default_msg, "> Sponsored by: If the change was sponsored by an organization." APR_EOL_STR); > + svn_stringbuf_appendcstr(default_msg, "> Empty fields above will be automatically removed." APR_EOL_STR); > + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); > > *tmp_file = NULL; > if (lmb->message) >-@@ -710,6 +804,7 @@ >+@@ -350,6 +447,7 @@ > that follows it. */ > truncate_buffer_at_prefix(&(log_msg_buf->len), log_msg_buf->data, > EDITOR_EOF_PREFIX); >@@ -126,7 +132,7 @@ > > /* Make a string from a stringbuf, sharing the data allocation. */ > log_msg_str->data = log_msg_buf->data; >-@@ -830,6 +925,13 @@ >+@@ -470,6 +568,13 @@ > if (message) > truncate_buffer_at_prefix(&message->len, message->data, > EDITOR_EOF_PREFIX);
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 195252
:
149677
| 149689 |
149691
|
149692