Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update copyright years to include 2011 #10865

Closed
sagetrac-mvngu mannequin opened this issue Mar 2, 2011 · 21 comments
Closed

update copyright years to include 2011 #10865

sagetrac-mvngu mannequin opened this issue Mar 2, 2011 · 21 comments
Assignees
@sagetrac-mvngu
Labels
c: documentation p: major / 3 t: bug
Milestone
sage-4.7

Comments

@sagetrac-mvngu
Copy link
Mannequin

sagetrac-mvngu mannequin commented Mar 2, 2011

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 attachment: trac-10865_copyright-doc.patch to sage-main.
  2. Apply attachment: trac-10865_copyright-macapp.patch to the data/extcode repository.
  3. Apply attachment: trac-10865_copyright-README.patch to SAGE-ROOT.

Component: documentation

Author: Minh Van Nguyen, Mariah Lenox

Reviewer: Minh Van Nguyen, Mariah Lenox

Merged: sage-4.7.alpha5

Issue created by migration from https://trac.sagemath.org/ticket/10865
@sagetrac-mvngu sagetrac-mvngu mannequin added this to the sage-4.7 milestone Mar 2, 2011
@sagetrac-mvngu sagetrac-mvngu mannequin self-assigned this Mar 2, 2011
@sagetrac-mvngu
Copy link
Mannequin Author

sagetrac-mvngu mannequin commented Mar 2, 2011

Attachment: README.txt

Attachment: README.txt.diff.gz

@sagetrac-mvngu
Copy link
Mannequin Author

sagetrac-mvngu mannequin commented Mar 2, 2011

Attachment: trac-10865_copyright-doc.patch.gz

@sagetrac-mvngu
Copy link
Mannequin Author

sagetrac-mvngu mannequin commented Mar 2, 2011

comment:1

Attachment: trac-10865_copyright-macapp.patch.gz

@sagetrac-mvngu

This comment has been minimized.

Sign in to view
@sagetrac-mvngu
Copy link
Mannequin Author

sagetrac-mvngu mannequin commented Mar 2, 2011

Author: Minh Van Nguyen

@sagetrac-mvngu sagetrac-mvngu mannequin added the s: needs review label Mar 2, 2011
@jdemeyer
Copy link

jdemeyer commented Apr 2, 2011

comment:2

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.

@sagetrac-mariah
Copy link
Mannequin

sagetrac-mariah mannequin commented Apr 7, 2011

Changed author from Minh Van Nguyen to Minh Van Nguyen, Mariah Lenox

@sagetrac-mariah

This comment has been minimized.

Sign in to view
@sagetrac-mariah
Copy link
Mannequin

sagetrac-mariah mannequin commented Apr 7, 2011

comment:3

Attachment: trac_10865_README.patch.gz

@sagetrac-mvngu
Copy link
Mannequin Author

sagetrac-mvngu mannequin commented Apr 9, 2011

comment:4

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.

@sagetrac-mvngu
Copy link
Mannequin Author

sagetrac-mvngu mannequin commented Apr 9, 2011

Reviewer: Minh Van Nguyen

@sagetrac-mariah

This comment has been minimized.

Sign in to view
@sagetrac-mariah
Copy link
Mannequin

sagetrac-mariah mannequin commented Apr 12, 2011

comment:5

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

I can give attachment: trac-10865_copyright-doc.patch
a positive review. However [attachment: 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

@sagetrac-mvngu
Copy link
Mannequin Author

sagetrac-mvngu mannequin commented Apr 13, 2011

comment:6

Replying to @sagetrac-mariah:

Minh - Would you please review
attachment: 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 https://github.com/sagemath/sage-prod/files/10652233/trac-10865_copyright-README.patch.gz && 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 attachment: trac-10865_copyright-doc.patch
a positive review. However [attachment: 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 https://github.com/sagemath/sage-prod/files/10652231/trac-10865_copyright-macapp.patch.gz && 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 https://github.com/sagemath/sage-prod/files/10652231/trac-10865_copyright-macapp.patch.gz && 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

@sagetrac-mariah
Copy link
Mannequin

sagetrac-mariah mannequin commented Apr 14, 2011

Attachment: trac-10865_copyright-README.patch.gz

@sagetrac-mariah
Copy link
Mannequin

sagetrac-mariah mannequin commented Apr 14, 2011

comment:7

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.

@sagetrac-mariah
Copy link
Mannequin

sagetrac-mariah mannequin commented Apr 14, 2011

Changed reviewer from Minh Van Nguyen to Minh Van Nguyen, Mariah Lenox

@sagetrac-mariah sagetrac-mariah mannequin removed the s: needs work label Apr 14, 2011
@sagetrac-mvngu
Copy link
Mannequin Author

sagetrac-mvngu mannequin commented Apr 14, 2011

comment:8

Replying to @sagetrac-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/

@sagetrac-mvngu

This comment has been minimized.

Sign in to view
@jdemeyer
Copy link

Merged: sage-4.7.rc0

@jdemeyer
Copy link

Changed merged from sage-4.7.rc0 to sage-4.7.alpha5

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@sagetrac-mvngu sagetrac-mvngu

Labels
c: documentation p: major / 3 t: bug
Projects
None yet
Milestone
sage-4.7
Development

No branches or pull requests
1 participant
@jdemeyer