#7973: Documentation for submitting a patch is overly confusing
----------------------------------+-----------------------------------------
Reporter: gaer | Owner: mvngu
Type: defect | Status: needs_work
Priority: major | Milestone: sage-4.3.1
Component: documentation | Keywords:
Work_issues: badly formed patch | Author:
Upstream: N/A | Reviewer:
Merged: |
----------------------------------+-----------------------------------------
Changes (by mvngu):
* status: needs_review => needs_work
* work_issues: => badly formed patch
Comment:
You're concatenating three different patches into one file. That would
result in failures when applying the resulting one file (with the three
patches):
{{{
[mv...@mod sage-main]$ hg qimport http://trac.sagemath.org/sage_trac/raw-
attachment/ticket/7973/13639.patch && hg qpush
adding 13639.patch to series file
applying 13639.patch
patching file doc/en/developer/producing_patches.rst
Hunk #1 FAILED at 21
Hunk #2 FAILED at 58
2 out of 2 hunks FAILED -- saving rejects to file
doc/en/developer/producing_patches.rst.rej
patching file doc/en/developer/producing_patches.rst
Hunk #1 FAILED at 21
Hunk #2 FAILED at 58
2 out of 2 hunks FAILED -- saving rejects to file
doc/en/developer/producing_patches.rst.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
errors during apply, please fix and refresh 13639.patch
}}}
Looking at the attachment
[http://trac.sagemath.org/sage_trac/attachment/ticket/7973/13639.patch
13639.patch] more closely, I see that the three patches only touch the
file
{{{
doc/en/developer/producing_patches.rst
}}}
I have split the three different patches into three different files and
attached them to this ticket for reference. Applying any one of them
individually is OK. But if I then first apply one and then any of the
other two, I'd get hunk failures. So of all the changes in your original
attachment, which set of changes did you intend to submit for review?
Also, one minor nit-pick: please reference the ticket number in your
commit message. The general format of a commit message should be:
{{{
trac xxxx: <your-commit-message-here>
}}}
where "xxxx" is the ticket number.
--
Ticket URL: <http://trac.sagemath.org/sage_trac/ticket/7973#comment:3>
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.
