Updates:
Labels: -NeedsReview NeedsBetterPatch
Comment #22 on issue 652 by asmeurer: Write tests for acosh, atanh, acoth
http://code.google.com/p/sympy/issues/detail?id=652
It still doesn't apply. You need to do
git checkout master # (hopefully your changes are in a different branch
than master)
git pull # update master.
git checkout branch-with-changes # Go back to your changes
git rebase master # Try to reapply them on top of the latest master
Here it will tell you there are conflicts in a file, unless you are lucky
(in this case, you will not be lucky or else the patch
would have applied). Open the file and fix them (search for <<<<), then do
git add file
git rebase --continue
and repeat until the changes are all fixed. It will also tell you what to
do during the rebase.
Also, it can help to post your changes to a branch on github, as that is
easier to review from.
--
You received this message because you are listed in the owner
or CC fields of this issue, or because you starred this issue.
You may adjust your issue notification preferences at:
http://code.google.com/hosting/settings
--
You received this message because you are subscribed to the Google Groups
"sympy-issues" 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/sympy-issues?hl=en.
