#10865: update copyright years to include 2011
---------------------------------------------+------------------------------
Reporter: mvngu | Owner: mvngu
Type: defect | Status: needs_work
Priority: major | Milestone: sage-4.7
Component: documentation | Keywords:
Author: Minh Van Nguyen, Mariah Lenox | Upstream: N/A
Reviewer: Minh Van Nguyen | Merged:
Work_issues: |
---------------------------------------------+------------------------------
Comment(by mvngu):
Replying to [comment:5 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
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 <[email protected]>
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 "# ".
[[BR]][[BR]]
> 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 <[email protected]>
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 <[email protected]>
date: Wed Mar 02 10:58:08 2011 -0800
summary: #10865: update copyright years to include 2011
}}}
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/10865#comment:6>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/sage-trac?hl=en.
