Changes between Initial Version and Version 28 of Ticket #2203


Ignore:
Timestamp:
05/22/10 10:31:42 (11 years ago)
Author:
mvngu
Comment:

I got a hunk failure when applying the patch on top of #8364 and #8166 in that order:

[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 http://trac.sagemath.org/sage_trac/raw-attachment/ticket/8364/trac_8364.patch && hg qpush 
adding trac_8364.patch to series file
applying trac_8364.patch
now at: trac_8364.patch
[mvngu@sage sage-main]$ hg qimport http://trac.sagemath.org/sage_trac/raw-attachment/ticket/8364/trac_8364-reviewer.patch && hg qpush 
adding trac_8364-reviewer.patch to series file
applying trac_8364-reviewer.patch
now at: trac_8364-reviewer.patch
[mvngu@sage sage-main]$ hg qimport http://trac.sagemath.org/sage_trac/raw-attachment/ticket/8166/trac_8166-rebase.patch && hg qpush 
adding trac_8166-rebase.patch to series file
applying trac_8166-rebase.patch
now at: trac_8166-rebase.patch
[mvngu@sage sage-main]$ hg qimport http://trac.sagemath.org/sage_trac/raw-attachment/ticket/2203/trac_2203.patch && hg qpush 
adding trac_2203.patch to series file
applying trac_2203.patch
patching file sage/graphs/generic_graph.py
Hunk #1 FAILED at 3637
1 out of 2 hunks FAILED -- saving rejects to file sage/graphs/generic_graph.py.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working dir
errors during apply, please fix and refresh trac_2203.patch

I have rebased ncohen's patch on top of #8364 and #8166. See the ticket description for instructions on how to apply the rebased patch. Someone other than myself needs to have a look through my rebase patch to make sure I didn't mess up anything. Because of this, I'm putting the ticket in "needs review". The code introduced by ncohen's patch (equivalently the code in the rebased patch) needs some clean-ups, but I won't do that here.

Legend:

Unmodified
Added
Removed
Modified
  • Ticket #2203

    • Property Status changed from new to needs_work
    • Property Authors changed from to Nathann Cohen
    • Property Milestone changed from sage-2.10.2 to sage-4.3.3
    • Property Summary changed from Integrate concorde in Sage to Add a traveling salesman problem solver
    • Property Report Upstream changed from to N/A
    • Property Owner changed from rlm to ncohen
    • Property Reviewers changed from to Jason Grout, David Joyner, Minh Van Nguyen
  • Ticket #2203 – Description

    initial v28  
    44
    55I have a student that might be interested in implementing an interface, so email me if you plan on working on this and I'll forward it to him.
     6
     7'''Apply:'''
     8
     9 1. #8364
     10 1. #8166
     11 1. [http://trac.sagemath.org/sage_trac/attachment/ticket/2203/trac_2203-rebase.patch trac_2203-rebase.patch]