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.
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
clean up documentation of logic/booleval.py #8792
Comments
This comment has been minimized.
This comment has been minimized.
Author: Minh Van Nguyen |
This comment has been minimized.
This comment has been minimized.
comment:2
Attachment: trac_8792-booleval-clean-ups.patch.gz Changes in the patch include:
|
comment:3
If I'm not mistaken, this patch does not apply against the brand new 4.4.2 with #8796 ^^; Nathann |
comment:4
Replying to @nathanncohen:
Could you try again? Here is how I applied the relevant patches: [mvngu@sage sage-main]$ pwd
/dev/shm/mvngu/sandbox/sage-4.4.2-8792-booleval/devel/sage-main
[mvngu@sage sage-main]$ hg tip
changeset: 14321:1451c00a8d44
tag: tip
user: Minh Van Nguyen <nguyenminh2@gmail.com>
date: Wed May 19 00:55:29 2010 -0700
summary: 4.4.2
[mvngu@sage sage-main]$ hg qimport https://github.com/sagemath/sage-prod/files/10648899/trac_8796-propcalc-clean-ups.patch.gz && hg qpush
adding trac_8796-propcalc-clean-ups.patch to series file
applying trac_8796-propcalc-clean-ups.patch
now at: trac_8796-propcalc-clean-ups.patch
[mvngu@sage sage-main]$ hg qimport https://github.com/sagemath/sage-prod/files/10648892/trac_8792-booleval-clean-ups.patch.gz && hg qpush
adding trac_8792-booleval-clean-ups.patch to series file
applying trac_8792-booleval-clean-ups.patch
now at: trac_8792-booleval-clean-ups.patch
[mvngu@sage sage-main]$ hg tip
changeset: 14323:a91966275ff3
tag: qtip
tag: trac_8792-booleval-clean-ups.patch
tag: tip
user: Minh Van Nguyen <nguyenminh2@gmail.com>
date: Sun May 02 20:59:37 2010 -0700
summary: #8792: clean up documentation of logic/booleval.py |
comment:5
Hmmmm... I'm really sorry but ...
is there anything I am doing wrong ? O_o |
comment:6
The rejects are all the fixes (a==b) => a == b at the end of your patch O_o Nathann |
comment:8
Replying to @nathanncohen:
Hi, I'm new to development and thought this patch looked like a good place to start. I got the same error message as Nathann. Is this patch still receiving attention? John |
comment:9
Replying to @sagetrac-jthurber:
By commenting on the ticket, it does. ;-) Though I personally currently have no time for it. Feel free to review it / upload a reviewer patch and we'll see... P.S.: If the current patch doesn't apply cleanly, the ticket's status should be set to "needs work" until the patch has been rebased. |
comment:10
$ hg import -v ~/Sage/patches/trac_8792-booleval-clean-ups.patch
applying /home/leif/Sage/patches/trac_8792-booleval-clean-ups.patch
patching file doc/en/reference/logic.rst
patching file sage/logic/booleval.py
doc/en/reference/logic.rst
sage/logic/booleval.py (This is with Sage 4.6. Documentation apparently builds ok, too, doctests pass.) |
comment:11
It also works for me with sage-4.6. |
comment:12
I wondered if it was my download technique, but I've tried it a couple of ways, including
so, unless someone has another suggestion, I will go ahead and suggest this needs to be rebased. |
comment:13
Hi, I figured it out. jthurber is using hg version 1.6, whereas Sage uses hg version 1.3. With 1.6 the algorithm for accepting hunks has been tightened (surely a good thing!) and the patch fails to apply, whereas it does apply with hg version 1.3. |
comment:14
Positive review, though there was one test timeout failure which passed when isolated from --testall. --testall --long led to
I isolated this test, it passed:
|
comment:15
jthurber: Please add your real name as "Reviewer" and also on Account Names mapped to Real Names |
Reviewer: John Thurber |
Merged: sage-4.6.1.alpha1 |
As the subject says. This needs to be coordinated with #8797.
Prerequisite: #8796
CC: @nexttime
Component: documentation
Author: Minh Van Nguyen
Reviewer: John Thurber
Merged: sage-4.6.1.alpha1
Issue created by migration from https://trac.sagemath.org/ticket/8792
The text was updated successfully, but these errors were encountered: