On Friday, 20 July 2012 19:24:26 UTC+8, Ben Hutz wrote: > > It was created with hg export. I just copied out the portion for the > relevant file to post (the whole patch is on trac #13120). I thought from > Volker's comment that the "diff ..." was the metadata. Based on your > comment, that seems to not be the case. What portion of the patch is the > "metadata" that it is having trouble syncing and what is it syncing with? >
metadata makes it possible store the right history context. What comes after "diff --git" is not relevant, AFAIK. for instance: $ less trac_13148-number_of_variables_in_LP.patch # HG changeset patch # User Dmitrii Pasechnik <[email protected]> # Date 1340443773 -10800 # Node ID 91eb41bf5fbdfa4db888780158232cb27be82235 # Parent caf386433bbef30e147fa04baa7159804f810704 adding number_of_variables() method to MixedIntegerProgram class diff --git a/sage/numerical/mip.pxd b/sage/numerical/mip.pxd [...] I guess, Date, Node ID, and Parent are crucial. -- -- To post to this group, send an email to [email protected] To unsubscribe from this group, send an email to [email protected] For more options, visit this group at http://groups.google.com/group/sage-devel URL: http://www.sagemath.org
