Submitter | Jesus Cea |
---|---|
Date | March 2, 2015, 2:03 p.m. |
Message ID | <3036e10a09628a4d4161.1425305033@ubuntu.ubuntu-domain> |
Download | mbox | patch |
Permalink | /patch/7875/ |
State | Changes Requested |
Headers | show |
Comments
On 02/03/15 15:03, Jesus Cea wrote: > diff -r 80af610c4ffb -r 3036e10a0962 contrib/wix/COPYING.rtf > Binary file contrib/wix/COPYING.rtf has changed This RTF file must be updated too. It is a single line change. I don't know how to send that changeset to the list.
On Mon, 2015-03-02 at 15:17 +0100, Jesus Cea wrote: > On 02/03/15 15:03, Jesus Cea wrote: > > diff -r 80af610c4ffb -r 3036e10a0962 contrib/wix/COPYING.rtf > > Binary file contrib/wix/COPYING.rtf has changed > > This RTF file must be updated too. It is a single line change. I don't > know how to send that changeset to the list. Probably with the --git flag. Not sure what "18n-*" is. Developers don't generally need to touch i18n files as translators will "automatically" fix the translations when you update the originals (and you're more likely to break things for them if you try). A proper summary would be "copyright: update to 2015". Otherwise, looks good!
On 02/03/15 18:03, Matt Mackall wrote: > On Mon, 2015-03-02 at 15:17 +0100, Jesus Cea wrote: >> On 02/03/15 15:03, Jesus Cea wrote: >>> diff -r 80af610c4ffb -r 3036e10a0962 contrib/wix/COPYING.rtf >>> Binary file contrib/wix/COPYING.rtf has changed >> >> This RTF file must be updated too. It is a single line change. I don't >> know how to send that changeset to the list. > > Probably with the --git flag. > > Not sure what "18n-*" is. Developers don't generally need to touch i18n > files as translators will "automatically" fix the translations when you > update the originals (and you're more likely to break things for them if > you try). A proper summary would be "copyright: update to 2015". > Otherwise, looks good! Should I send a new diff with the RTF patch?. It is a single date change. "--git" do it, but it is an encoded binary mess you can't review as is. I have made a pull request for the i18n part in bitbucket: <https://bitbucket.org/mg/hg-i18n/pull-request/7/update-copyright-dates/diff>. There are translations with "2005-2009" copyright. For instance "i18n/el.po". So my question is: Should I do anything else to get this in 3.3.2?.
On Mon, 2015-03-02 at 18:52 +0100, Jesus Cea wrote: > On 02/03/15 18:03, Matt Mackall wrote: > > On Mon, 2015-03-02 at 15:17 +0100, Jesus Cea wrote: > >> On 02/03/15 15:03, Jesus Cea wrote: > >>> diff -r 80af610c4ffb -r 3036e10a0962 contrib/wix/COPYING.rtf > >>> Binary file contrib/wix/COPYING.rtf has changed > >> > >> This RTF file must be updated too. It is a single line change. I don't > >> know how to send that changeset to the list. > > > > Probably with the --git flag. > > > > Not sure what "18n-*" is. Developers don't generally need to touch i18n > > files as translators will "automatically" fix the translations when you > > update the originals (and you're more likely to break things for them if > > you try). A proper summary would be "copyright: update to 2015". > > Otherwise, looks good! > > Should I send a new diff with the RTF patch? Resend a your current diff + RTF + updated summary line - anything to do with the i18n/ dir, please. > There are translations with "2005-2009" copyright. For instance > "i18n/el.po". Yep. Leave it for the translators.
Patch
diff -r 80af610c4ffb -r 3036e10a0962 contrib/win32/ReadMe.html --- a/contrib/win32/ReadMe.html Mon Mar 02 01:06:31 2015 -0600 +++ b/contrib/win32/ReadMe.html Mon Mar 02 14:52:04 2015 +0100 @@ -140,7 +140,7 @@ </p> <p> - Mercurial is Copyright 2005-2014 Matt Mackall and others. See + Mercurial is Copyright 2005-2015 Matt Mackall and others. See the <tt>Contributors.txt</tt> file for a list of contributors. </p> diff -r 80af610c4ffb -r 3036e10a0962 contrib/win32/mercurial.iss --- a/contrib/win32/mercurial.iss Mon Mar 02 01:06:31 2015 -0600 +++ b/contrib/win32/mercurial.iss Mon Mar 02 14:52:04 2015 +0100 @@ -21,7 +21,7 @@ #endif [Setup] -AppCopyright=Copyright 2005-2010 Matt Mackall and others +AppCopyright=Copyright 2005-2015 Matt Mackall and others AppName=Mercurial #if ARCH == "x64" AppVerName=Mercurial {#VERSION} (64-bit) @@ -44,7 +44,7 @@ DefaultDirName={pf}\Mercurial SourceDir=..\.. VersionInfoDescription=Mercurial distributed SCM (version {#VERSION}) -VersionInfoCopyright=Copyright 2005-2010 Matt Mackall and others +VersionInfoCopyright=Copyright 2005-2015 Matt Mackall and others VersionInfoCompany=Matt Mackall and others InternalCompressLevel=max SolidCompression=true diff -r 80af610c4ffb -r 3036e10a0962 contrib/wix/COPYING.rtf Binary file contrib/wix/COPYING.rtf has changed diff -r 80af610c4ffb -r 3036e10a0962 mercurial/commands.py --- a/mercurial/commands.py Mon Mar 02 01:06:31 2015 -0600 +++ b/mercurial/commands.py Mon Mar 02 14:52:04 2015 +0100 @@ -6303,7 +6303,7 @@ % util.version()) ui.status(_( "(see http://mercurial.selenic.com for more information)\n" - "\nCopyright (C) 2005-2014 Matt Mackall and others\n" + "\nCopyright (C) 2005-2015 Matt Mackall and others\n" "This is free software; see the source for copying conditions. " "There is NO\nwarranty; " "not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" diff -r 80af610c4ffb -r 3036e10a0962 mercurial/help/hg.1.txt --- a/mercurial/help/hg.1.txt Mon Mar 02 01:06:31 2015 -0600 +++ b/mercurial/help/hg.1.txt Mon Mar 02 14:52:04 2015 +0100 @@ -112,7 +112,7 @@ Copying """"""" -Copyright (C) 2005-2014 Matt Mackall. +Copyright (C) 2005-2015 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version. diff -r 80af610c4ffb -r 3036e10a0962 mercurial/help/hgignore.5.txt --- a/mercurial/help/hgignore.5.txt Mon Mar 02 01:06:31 2015 -0600 +++ b/mercurial/help/hgignore.5.txt Mon Mar 02 14:52:04 2015 +0100 @@ -26,7 +26,7 @@ Copying ======= This manual page is copyright 2006 Vadim Gelfer. -Mercurial is copyright 2005-2014 Matt Mackall. +Mercurial is copyright 2005-2015 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version. diff -r 80af610c4ffb -r 3036e10a0962 mercurial/help/hgrc.5.txt --- a/mercurial/help/hgrc.5.txt Mon Mar 02 01:06:31 2015 -0600 +++ b/mercurial/help/hgrc.5.txt Mon Mar 02 14:52:04 2015 +0100 @@ -34,7 +34,7 @@ Copying ======= This manual page is copyright 2005 Bryan O'Sullivan. -Mercurial is copyright 2005-2014 Matt Mackall. +Mercurial is copyright 2005-2015 Matt Mackall. Free use of this software is granted under the terms of the GNU General Public License version 2 or any later version. diff -r 80af610c4ffb -r 3036e10a0962 setup.py --- a/setup.py Mon Mar 02 01:06:31 2015 -0600 +++ b/setup.py Mon Mar 02 14:52:04 2015 +0100 @@ -555,7 +555,7 @@ if py2exeloaded: extra['console'] = [ {'script':'hg', - 'copyright':'Copyright (C) 2005-2010 Matt Mackall and others', + 'copyright':'Copyright (C) 2005-2015 Matt Mackall and others', 'product_version':version}] # sub command of 'build' because 'py2exe' does not handle sub_commands build.sub_commands.insert(0, ('build_hgextindex', None)) diff -r 80af610c4ffb -r 3036e10a0962 tests/test-help.t --- a/tests/test-help.t Mon Mar 02 01:06:31 2015 -0600 +++ b/tests/test-help.t Mon Mar 02 14:52:04 2015 +0100 @@ -411,7 +411,7 @@ Mercurial Distributed SCM (version *) (glob) (see http://mercurial.selenic.com for more information) - Copyright (C) 2005-2014 Matt Mackall and others + Copyright (C) 2005-2015 Matt Mackall and others This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. diff -r 80af610c4ffb -r 3036e10a0962 tests/test-hgrc.t --- a/tests/test-hgrc.t Mon Mar 02 01:06:31 2015 -0600 +++ b/tests/test-hgrc.t Mon Mar 02 14:52:04 2015 +0100 @@ -71,7 +71,7 @@ Mercurial Distributed SCM (version *) (glob) (see http://mercurial.selenic.com for more information) - Copyright (C) 2005-2014 Matt Mackall and others + Copyright (C) 2005-2015 Matt Mackall and others This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. $ unset FAKEPATH