Opened 10 years ago

Closed 10 years ago

Last modified 10 years ago

#10865 closed defect (fixed)

update copyright years to include 2011

Reported by: mvngu Owned by: mvngu
Priority: major Milestone: sage-4.7
Component: documentation Keywords:
Cc: Merged in: sage-4.7.alpha5
Authors: Minh Van Nguyen, Mariah Lenox Reviewers: Minh Van Nguyen, Mariah Lenox
Report Upstream: N/A Work issues:
Branch: Commit:
Dependencies: Stopgaps:

Description (last modified by mvngu)

As the subject says. The relevant files for which the copyright years need to be updated are:

  • devel/sage-main/doc/common/conf.py
  • data/extcode/sage/ext/mac-app/Sage-Info.plist
  • README.txt

Apply:

  1. Apply trac-10865_copyright-doc.patch to sage-main.
  2. Apply trac-10865_copyright-macapp.patch to the data/extcode repository.
  3. Apply trac-10865_copyright-README.patch to SAGE-ROOT.

Attachments (6)

README.txt (10.0 KB) - added by mvngu 10 years ago.
README.txt.diff (472 bytes) - added by mvngu 10 years ago.
trac-10865_copyright-doc.patch (689 bytes) - added by mvngu 10 years ago.
trac-10865_copyright-macapp.patch (745 bytes) - added by mvngu 10 years ago.
trac_10865_README.patch (748 bytes) - added by mariah 10 years ago.
trac-10865_copyright-README.patch (719 bytes) - added by mariah 10 years ago.

Download all attachments as: .zip

Change History (16)

Changed 10 years ago by mvngu

Changed 10 years ago by mvngu

Changed 10 years ago by mvngu

Changed 10 years ago by mvngu

comment:1 Changed 10 years ago by mvngu

  • Authors set to Minh Van Nguyen
  • Description modified (diff)
  • Status changed from new to needs_review

comment:2 Changed 10 years ago by jdemeyer

  • Status changed from needs_review to needs_work

SAGE_ROOT now has a hg repository (#9433), so you should use that to update the README.txt. i.e.: use the usual procedure with hg commands to produce a patch.

Changed 10 years ago by mariah

comment:3 Changed 10 years ago by mariah

  • Authors changed from Minh Van Nguyen to Minh Van Nguyen, Mariah Lenox
  • Description modified (diff)
  • Status changed from needs_work to needs_review

comment:4 Changed 10 years ago by mvngu

  • Reviewers set to Minh Van Nguyen

Mariah: If you add the ticket number to your patch and provide a proper commit merge, then your patch should be OK by me. Of course, someone other than myself needs to give the go-ahead for the remaining two patches.

comment:5 follow-up: Changed 10 years ago by mariah

  • Description modified (diff)
  • Status changed from needs_review to needs_work

Minh - Would you please review trac-10865_copyright-README.patch

I can give trac-10865_copyright-doc.patch a positive review. However trac-10865_copyright-macapp.patch needs work - it does not apply because the path is wrong. You have sage/ext/mac-app/Sage-Info.plist when I believe you mean data/extcode/sage/ext/mac-app/Sage-Info.plist

comment:6 in reply to: ↑ 5 Changed 10 years ago by mvngu

Replying to mariah:

Minh - Would you please review trac-10865_copyright-README.patch

Notice the following line in your patch for the README file:

# Trac 10865: update copyright years to include 2011

This would be interpreted by Mercurial as a comment on a patch file, and not as a commit message as you intended. The hash "#" followed by a space is Mercurial's magic pattern for delimiting a comment. For example:

[mvngu@sage sage-4.7.alpha4]$ hg qimport http://trac.sagemath.org/sage_trac/raw-attachment/ticket/10865/trac-10865_copyright-README.patch && hg qpush 
adding trac-10865_copyright-README.patch to series file
applying trac-10865_copyright-README.patch
now at: trac-10865_copyright-README.patch
[mvngu@sage sage-4.7.alpha4]$ hg tip
changeset:   10:1f2ac1797126
tag:         qtip
tag:         tip
tag:         trac-10865_copyright-README.patch
tag:         qbase
user:        Mariah Lenox <mariah.lenox@gmail.com>
date:        Tue Apr 12 14:43:13 2011 -0400
summary:     imported patch trac-10865_copyright-README.patch

Thus the content for the "summary:" line should be

summary:     Trac 10865: update copyright years to include 2011

instead of

summary:     imported patch trac-10865_copyright-README.patch

To rectify the situation, simply remove the string "# ".

I can give trac-10865_copyright-doc.patch a positive review. However trac-10865_copyright-macapp.patch needs work - it does not apply because the path is wrong. You have sage/ext/mac-app/Sage-Info.plist when I believe you mean data/extcode/sage/ext/mac-app/Sage-Info.plist

The given path is wrong if you apply the patch from SAGE_ROOT. Note that SAGE_ROOT was recently put under revision control, whereas data/extcode has been under revision control for many years now. During that time, data/extcode was and still is its own Mercurial repository, separate from everything else that is under revision control. So to apply a patch to data/extcode, you would need to do

$ cd data/extcode

and then apply the patch. Here's an illustration:

[mvngu@sage sage-4.7.alpha4]$ hg tip
changeset:   9:7d65e0c65ba0
tag:         tip
user:        Jeroen Demeyer <jdemeyer@cage.ugent.be>
date:        Mon Apr 11 08:55:03 2011 +0000
summary:     Added tag 4.7.alpha4 for changeset 072b1c841573

[mvngu@sage sage-4.7.alpha4]$ hg qimport http://trac.sagemath.org/sage_trac/raw-attachment/ticket/10865/trac-10865_copyright-macapp.patch && hg qpush 
adding trac-10865_copyright-macapp.patch to series file
applying trac-10865_copyright-macapp.patch
unable to find 'sage/ext/mac-app/Sage-Info.plist' for patching
1 out of 1 hunks FAILED -- saving rejects to file sage/ext/mac-app/Sage-Info.plist.rej
patch failed, unable to continue (try -v)
sage/ext/mac-app/Sage-Info.plist: Not a directory
patch failed, rejects left in working dir
errors during apply, please fix and refresh trac-10865_copyright-macapp.patch
[mvngu@sage sage-4.7.alpha4]$ hg qpop -a
patch queue now empty
[mvngu@sage sage-4.7.alpha4]$ hg qdelete $(hg qunapplied)
[mvngu@sage sage-4.7.alpha4]$ cd data/extcode/
[mvngu@sage extcode]$ hg qimport http://trac.sagemath.org/sage_trac/raw-attachment/ticket/10865/trac-10865_copyright-macapp.patch && hg qpush 
adding trac-10865_copyright-macapp.patch to series file
applying trac-10865_copyright-macapp.patch
now at: trac-10865_copyright-macapp.patch
[mvngu@sage extcode]$ hg tip
changeset:   544:a159dd0446c6
tag:         qtip
tag:         trac-10865_copyright-macapp.patch
tag:         tip
tag:         qbase
user:        Minh Van Nguyen <nguyenminh2@gmail.com>
date:        Wed Mar 02 10:58:08 2011 -0800
summary:     #10865: update copyright years to include 2011

Changed 10 years ago by mariah

comment:7 follow-up: Changed 10 years ago by mariah

  • Reviewers changed from Minh Van Nguyen to Minh Van Nguyen, Mariah Lenox
  • Status changed from needs_work to needs_review

Minh,

I have updated trac-10865_copyright-README.patch to take advantage of your explaination. I want to thank you for your patience with me. Would you please review this patch.

I have reviewed your patches trac-10865_copyright-doc.patch and trac-10865_copyright-macapp.patch and give them a postive review.

comment:8 in reply to: ↑ 7 Changed 10 years ago by mvngu

  • Description modified (diff)
  • Status changed from needs_review to positive_review

Replying to mariah:

I have updated trac-10865_copyright-README.patch to take advantage of your explaination. I want to thank you for your patience with me. Would you please review this patch.

Positive review. Yay! \o/

comment:9 Changed 10 years ago by jdemeyer

  • Merged in set to sage-4.7.rc0
  • Resolution set to fixed
  • Status changed from positive_review to closed

comment:10 Changed 10 years ago by jdemeyer

  • Merged in changed from sage-4.7.rc0 to sage-4.7.alpha5
Note: See TracTickets for help on using tickets.