Opened 12 years ago

Closed 12 years ago

Last modified 12 years ago

#10560 closed defect (fixed)

Spelling errors in generic_graph.py

Reported by: eviatarbach Owned by: mvngu
Priority: minor Milestone: sage-4.6.2
Component: documentation Keywords:
Cc: Merged in: sage-4.6.2.alpha2
Authors: Eviatar Bach Reviewers: André Apitzsch
Report Upstream: N/A Work issues:
Branch: Commit:
Dependencies: Stopgaps:

Status badges

Description

Fixing some spelling errors in generic_graph.py. The only ones are changing "hamiltonian" to "Hamiltonian" and adding a dash after "non"s.

Attachments (4)

15059.patch (7.1 KB) - added by eviatarbach 12 years ago.
15060.patch (1.7 KB) - added by eviatarbach 12 years ago.
Fixes lowercase "eulerians". Should be applied with the previous patch.
15206.patch (9.5 KB) - added by eviatarbach 12 years ago.
10560.2.patch (9.5 KB) - added by jdemeyer 12 years ago.
Fixed filename and commit message, same patch as 15206.patch

Download all attachments as: .zip

Change History (18)

Changed 12 years ago by eviatarbach

comment:1 Changed 12 years ago by eviatarbach

  • Status changed from new to needs_review

comment:2 Changed 12 years ago by aapitzsch

  • Status changed from needs_review to positive_review

comment:3 Changed 12 years ago by eviatarbach

Adding a new patch to fix lowercase "eulerian".

Changed 12 years ago by eviatarbach

Fixes lowercase "eulerians". Should be applied with the previous patch.

comment:4 Changed 12 years ago by jdemeyer

  • Status changed from positive_review to needs_work

aapitzsch: please add your real name to http://trac.sagemath.org/sage_trac/#AccountNamesmappedtoRealNames and add your name on this ticket as reviewer.

comment:5 Changed 12 years ago by aapitzsch

  • Reviewers set to André Apitzsch
  • Status changed from needs_work to positive_review

comment:6 Changed 12 years ago by jdemeyer

  • Milestone set to sage-4.6.2
  • Status changed from positive_review to needs_work
  • Work issues set to rebase

The patch does not apply for me:

applying /scratch/jdemeyer/merger/downloads/15059.patch
patching file sage/graphs/generic_graph.py
Hunk #6 FAILED at 4568
Hunk #7 FAILED at 4589
Hunk #8 FAILED at 4613
Hunk #10 succeeded at 13968 with fuzz 2 (offset 110 lines).
3 out of 11 hunks FAILED -- saving rejects to file sage/graphs/generic_graph.py.rej

comment:7 Changed 12 years ago by eviatarbach

I tried this with a fresh repository and it worked perfectly. Are you sure you don't have any patches that are conflicting?

Thanks.

comment:8 follow-up: Changed 12 years ago by jdemeyer

Are you using sage-4.6.1.rc0 (the latest development release)?

comment:9 in reply to: ↑ 8 ; follow-up: Changed 12 years ago by eviatarbach

Replying to jdemeyer:

Are you using sage-4.6.1.rc0 (the latest development release)?

No. Should I be? Since it's a release candidate, aren't some things liable to change and break patches?

comment:10 in reply to: ↑ 9 Changed 12 years ago by jdemeyer

Replying to eviatarbach:

Replying to jdemeyer:

Are you using sage-4.6.1.rc0 (the latest development release)?

No. Should I be? Since it's a release candidate, aren't some things liable to change and break patches?

It's true that an alpha version or release candidate could be less stable than a released version, but for Sage development these are the versions you are suppose to be using. A lot of things have changed between sage-4.6 and sage-4.6.1.rc0, apparently making your patch not apply any more.

You should read the following sage-devel thread: http://groups.google.com/group/sage-devel/browse_thread/thread/efe4103a28eece9d

comment:11 Changed 12 years ago by eviatarbach

  • Status changed from needs_work to needs_review

Ah, thank you for the information. I uploaded a new patch.

Changed 12 years ago by eviatarbach

comment:12 Changed 12 years ago by aapitzsch

  • Status changed from needs_review to positive_review

It could applied to 4.6.1rc1 without problems.

Changed 12 years ago by jdemeyer

Fixed filename and commit message, same patch as 15206.patch

comment:13 Changed 12 years ago by jdemeyer

  • Merged in set to sage-4.6.2.alpha2
  • Resolution set to fixed
  • Status changed from positive_review to closed

comment:14 Changed 12 years ago by jdemeyer

  • Work issues rebase deleted
Note: See TracTickets for help on using tickets.