Some more info: I have extracted the non-merge commits from Jon's code: [EMAIL PROTECTED]:~$ wc -l /home/jonhanke/hanke_10* 9845 /home/jonhanke/hanke_10553-10566.patch 12783 /home/jonhanke/hanke_10568-10593.patch 2921 /home/jonhanke/hanke_10595-10605.patch 5628 /home/jonhanke/hanke_10608-10628.patch 31177 total
The total diff is roughly 31k lines, but as is those patches cannot be imported since the headers do not match. In total we have 202 diffs that nearly all go into quadratic_forms/* /home/jonhanke/hanke_10553-10566.patch:diff -r b47ecf2103a2 -r a8aa0db26793 sage/quadratic_forms/all.py /home/jonhanke/hanke_10553-10566.patch:diff -r b47ecf2103a2 -r a8aa0db26793 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10553-10566.patch:diff -r a8aa0db26793 -r 4621134f3316 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10553-10566.patch:diff -r 4621134f3316 -r 13c67d588a44 sage/quadratic_forms/all.py /home/jonhanke/hanke_10553-10566.patch:diff -r 4621134f3316 -r 13c67d588a44 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10553-10566.patch:diff -r 13c67d588a44 -r 659699cee916 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10553-10566.patch:diff -r 659699cee916 -r 4655c2deaf58 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10553-10566.patch:diff -r 4655c2deaf58 -r 1b8b3ca2cce9 sage/quadratic_forms/all.py /home/jonhanke/hanke_10553-10566.patch:diff -r 4655c2deaf58 -r 1b8b3ca2cce9 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10553-10566.patch:diff -r 1b8b3ca2cce9 -r ef767c34093b sage/quadratic_forms/extras.py /home/jonhanke/hanke_10553-10566.patch:diff -r ef767c34093b -r 3c3788117d40 sage/quadratic_forms/count_local_2.py /home/jonhanke/hanke_10553-10566.patch:diff -r ef767c34093b -r 3c3788117d40 sage/quadratic_forms/local_density_congruence.py /home/jonhanke/hanke_10553-10566.patch:diff -r ef767c34093b -r 3c3788117d40 sage/quadratic_forms/local_density_interfaces.py /home/jonhanke/hanke_10553-10566.patch:diff -r ef767c34093b -r 3c3788117d40 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10553-10566.patch:diff -r 3c3788117d40 -r d3c2cc9373ad sage/quadratic_forms/all.py /home/jonhanke/hanke_10553-10566.patch:diff -r 3c3788117d40 -r d3c2cc9373ad sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10553-10566.patch:diff -r 3c3788117d40 -r d3c2cc9373ad sage/quadratic_forms/quadratic_form__count_local_2.py /home/jonhanke/hanke_10553-10566.patch:diff -r 3c3788117d40 -r d3c2cc9373ad sage/quadratic_forms/ quadratic_form__local_density_congruence.py /home/jonhanke/hanke_10553-10566.patch:diff -r 3c3788117d40 -r d3c2cc9373ad sage/quadratic_forms/ quadratic_form__local_density_interfaces.py /home/jonhanke/hanke_10553-10566.patch:diff -r 3c3788117d40 -r d3c2cc9373ad sage/quadratic_forms/quadratic_form__theta_by_cholesky.py /home/jonhanke/hanke_10553-10566.patch:diff -r d3c2cc9373ad -r 12f9cb3d3b18 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10553-10566.patch:diff -r d3c2cc9373ad -r 12f9cb3d3b18 sage/quadratic_forms/quadratic_form__count_local_2.py /home/jonhanke/hanke_10553-10566.patch:diff -r d3c2cc9373ad -r 12f9cb3d3b18 sage/quadratic_forms/ quadratic_form__local_density_congruence.py /home/jonhanke/hanke_10553-10566.patch:diff -r d3c2cc9373ad -r 12f9cb3d3b18 sage/quadratic_forms/quadratic_form__siegel_product.py /home/jonhanke/hanke_10553-10566.patch:diff -r 12f9cb3d3b18 -r 8d6fe5a89fea sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10553-10566.patch:diff -r 8d6fe5a89fea -r 3a4b8fd88db6 sage/quadratic_forms/all.py /home/jonhanke/hanke_10553-10566.patch:diff -r 8d6fe5a89fea -r 3a4b8fd88db6 sage/quadratic_forms/extras.py /home/jonhanke/hanke_10553-10566.patch:diff -r 8d6fe5a89fea -r 3a4b8fd88db6 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10553-10566.patch:diff -r 8d6fe5a89fea -r 3a4b8fd88db6 sage/quadratic_forms/quadratic_form__neighbors.py /home/jonhanke/hanke_10553-10566.patch:diff -r 8d6fe5a89fea -r 3a4b8fd88db6 sage/quadratic_forms/quadratic_form__reduction_theory.py /home/jonhanke/hanke_10553-10566.patch:diff -r 8d6fe5a89fea -r 3a4b8fd88db6 sage/quadratic_forms/quadratic_form__ternary_Tornaria.py /home/jonhanke/hanke_10553-10566.patch:diff -r 3a4b8fd88db6 -r 15296532d596 sage/quadratic_forms/all.py /home/jonhanke/hanke_10553-10566.patch:diff -r 3a4b8fd88db6 -r 15296532d596 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10553-10566.patch:diff -r 3a4b8fd88db6 -r 15296532d596 sage/quadratic_forms/quadratic_form__siegel_product.py /home/jonhanke/hanke_10553-10566.patch:diff -r 3a4b8fd88db6 -r 15296532d596 sage/quadratic_forms/special_values.py /home/jonhanke/hanke_10553-10566.patch:diff -r 15296532d596 -r 2325bff07338 sage/quadratic_forms/all.py /home/jonhanke/hanke_10553-10566.patch:diff -r 15296532d596 -r 2325bff07338 sage/quadratic_forms/count_local_2.py /home/jonhanke/hanke_10553-10566.patch:diff -r 15296532d596 -r 2325bff07338 sage/quadratic_forms/local_density_congruence.py /home/jonhanke/hanke_10553-10566.patch:diff -r 15296532d596 -r 2325bff07338 sage/quadratic_forms/local_density_interfaces.py /home/jonhanke/hanke_10553-10566.patch:diff -r 15296532d596 -r 2325bff07338 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10553-10566.patch:diff -r 15296532d596 -r 2325bff07338 sage/quadratic_forms/quadratic_form__count_local_2.py /home/jonhanke/hanke_10553-10566.patch:diff -r 15296532d596 -r 2325bff07338 sage/quadratic_forms/ quadratic_form__local_density_congruence.py /home/jonhanke/hanke_10553-10566.patch:diff -r 15296532d596 -r 2325bff07338 sage/quadratic_forms/ quadratic_form__local_density_interfaces.py /home/jonhanke/hanke_10553-10566.patch:diff -r 15296532d596 -r 2325bff07338 sage/quadratic_forms/quadratic_form__mass.py /home/jonhanke/hanke_10553-10566.patch:diff -r 15296532d596 -r 2325bff07338 sage/quadratic_forms/quadratic_form__reduction_theory.py /home/jonhanke/hanke_10553-10566.patch:diff -r 15296532d596 -r 2325bff07338 sage/quadratic_forms/quadratic_form__siegel_product.py /home/jonhanke/hanke_10553-10566.patch:diff -r 15296532d596 -r 2325bff07338 sage/quadratic_forms/quadratic_form__ternary_Tornaria.py /home/jonhanke/hanke_10553-10566.patch:diff -r 15296532d596 -r 2325bff07338 sage/quadratic_forms/quadratic_form__theta_by_cholesky.py /home/jonhanke/hanke_10553-10566.patch:diff -r 15296532d596 -r 2325bff07338 sage/quadratic_forms/special_values.py /home/jonhanke/hanke_10568-10593.patch:diff -r 22fee559b081 -r abf9c8d7aae4 sage/quadratic_forms/all.py /home/jonhanke/hanke_10568-10593.patch:diff -r 22fee559b081 -r abf9c8d7aae4 sage/quadratic_forms/extras.py /home/jonhanke/hanke_10568-10593.patch:diff -r 22fee559b081 -r abf9c8d7aae4 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r 22fee559b081 -r abf9c8d7aae4 sage/quadratic_forms/quadratic_form__count_local_2.py /home/jonhanke/hanke_10568-10593.patch:diff -r 22fee559b081 -r abf9c8d7aae4 sage/quadratic_forms/ quadratic_form__local_density_congruence.py /home/jonhanke/hanke_10568-10593.patch:diff -r 22fee559b081 -r abf9c8d7aae4 sage/quadratic_forms/ quadratic_form__local_density_interfaces.py /home/jonhanke/hanke_10568-10593.patch:diff -r 22fee559b081 -r abf9c8d7aae4 sage/quadratic_forms/quadratic_form__mass.py /home/jonhanke/hanke_10568-10593.patch:diff -r 22fee559b081 -r abf9c8d7aae4 sage/quadratic_forms/quadratic_form__neighbors.py /home/jonhanke/hanke_10568-10593.patch:diff -r 22fee559b081 -r abf9c8d7aae4 sage/quadratic_forms/quadratic_form__reduction_theory.py /home/jonhanke/hanke_10568-10593.patch:diff -r 22fee559b081 -r abf9c8d7aae4 sage/quadratic_forms/quadratic_form__siegel_product.py /home/jonhanke/hanke_10568-10593.patch:diff -r 22fee559b081 -r abf9c8d7aae4 sage/quadratic_forms/quadratic_form__ternary_Tornaria.py /home/jonhanke/hanke_10568-10593.patch:diff -r 22fee559b081 -r abf9c8d7aae4 sage/quadratic_forms/quadratic_form__theta_by_cholesky.py /home/jonhanke/hanke_10568-10593.patch:diff -r 22fee559b081 -r abf9c8d7aae4 sage/quadratic_forms/special_values.py /home/jonhanke/hanke_10568-10593.patch:diff -r abf9c8d7aae4 -r 8fa815df5c0c sage/quadratic_forms/all.py /home/jonhanke/hanke_10568-10593.patch:diff -r abf9c8d7aae4 -r 8fa815df5c0c sage/quadratic_forms/genera/genus.py /home/jonhanke/hanke_10568-10593.patch:diff -r abf9c8d7aae4 -r 8fa815df5c0c sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r abf9c8d7aae4 -r 8fa815df5c0c sage/quadratic_forms/quadratic_form__genus.py /home/jonhanke/hanke_10568-10593.patch:diff -r 8fa815df5c0c -r cb1f22c6491d sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r 8fa815df5c0c -r cb1f22c6491d sage/quadratic_forms/quadratic_form__local_normal_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r cb1f22c6491d -r e232ef03f61a sage/quadratic_forms/quadratic_form__local_normal_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r e232ef03f61a -r dac66215e308 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r e232ef03f61a -r dac66215e308 sage/quadratic_forms/quadratic_form__mass__Pall_Watson.py /home/jonhanke/hanke_10568-10593.patch:diff -r dac66215e308 -r 84124066a905 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r 84124066a905 -r 69cc453e773e sage/quadratic_forms/extras.py /home/jonhanke/hanke_10568-10593.patch:diff -r 84124066a905 -r 69cc453e773e sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r 84124066a905 -r 69cc453e773e sage/quadratic_forms/quadratic_form__local_normal_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r 69cc453e773e -r 6c36f4eef6a2 sage/quadratic_forms/ quadratic_form__local_field_invariants.py /home/jonhanke/hanke_10568-10593.patch:diff -r 69cc453e773e -r 6c36f4eef6a2 sage/quadratic_forms/quadratic_form__mass__Pall_Watson.py /home/jonhanke/hanke_10568-10593.patch:diff -r 69cc453e773e -r 6c36f4eef6a2 sage/quadratic_forms/ quadratic_form__variable_substitutions.py /home/jonhanke/hanke_10568-10593.patch:diff -r 6c36f4eef6a2 -r b4730901580d sage/quadratic_forms/quadratic_form__mass__Pall_Watson.py /home/jonhanke/hanke_10568-10593.patch:diff -r b4730901580d -r 445744df22a9 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r b4730901580d -r 445744df22a9 sage/quadratic_forms/quadratic_form__mass__Pall_Watson.py /home/jonhanke/hanke_10568-10593.patch:diff -r 445744df22a9 -r 9886bbe0b650 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r 9886bbe0b650 -r c66534e6e90b sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r c66534e6e90b -r fbe98c73e1c2 sage/quadratic_forms/extras.py /home/jonhanke/hanke_10568-10593.patch:diff -r c66534e6e90b -r fbe98c73e1c2 sage/quadratic_forms/quadratic_form__mass__Pall_Watson.py /home/jonhanke/hanke_10568-10593.patch:diff -r c66534e6e90b -r fbe98c73e1c2 sage/quadratic_forms/special_values.py /home/jonhanke/hanke_10568-10593.patch:diff -r fbe98c73e1c2 -r 704429a4705f sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r fbe98c73e1c2 -r 704429a4705f sage/quadratic_forms/quadratic_form__mass__Pall_Watson.py /home/jonhanke/hanke_10568-10593.patch:diff -r 704429a4705f -r 7cfb53936344 sage/quadratic_forms/extras.py /home/jonhanke/hanke_10568-10593.patch:diff -r 704429a4705f -r 7cfb53936344 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r 704429a4705f -r 7cfb53936344 sage/quadratic_forms/quadratic_form__count_local_2.py /home/jonhanke/hanke_10568-10593.patch:diff -r 704429a4705f -r 7cfb53936344 sage/quadratic_forms/ quadratic_form__local_density_congruence.py /home/jonhanke/hanke_10568-10593.patch:diff -r 704429a4705f -r 7cfb53936344 sage/quadratic_forms/ quadratic_form__local_density_interfaces.py /home/jonhanke/hanke_10568-10593.patch:diff -r 704429a4705f -r 7cfb53936344 sage/quadratic_forms/ quadratic_form__local_representation_conditions.py /home/jonhanke/hanke_10568-10593.patch:diff -r 7cfb53936344 -r ae9c05352aa3 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r 7cfb53936344 -r ae9c05352aa3 sage/quadratic_forms/ quadratic_form__split_local_covering.py /home/jonhanke/hanke_10568-10593.patch:diff -r ae9c05352aa3 -r 189ec27f2d1a sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r ae9c05352aa3 -r 189ec27f2d1a sage/quadratic_forms/ quadratic_form__split_local_covering.py /home/jonhanke/hanke_10568-10593.patch:diff -r ae9c05352aa3 -r 189ec27f2d1a sage/quadratic_forms/ quadratic_form__variable_substitutions.py /home/jonhanke/hanke_10568-10593.patch:diff -r 189ec27f2d1a -r 2ba1f77e222f sage/quadratic_forms/ quadratic_form__local_representation_conditions.py /home/jonhanke/hanke_10568-10593.patch:diff -r 2ba1f77e222f -r 5ba122bb149a sage/quadratic_forms/ quadratic_form__local_representation_conditions.py /home/jonhanke/hanke_10568-10593.patch:diff -r 5ba122bb149a -r dcd3ff128990 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r 5ba122bb149a -r dcd3ff128990 sage/quadratic_forms/ quadratic_form__split_local_covering.py /home/jonhanke/hanke_10568-10593.patch:diff -r dcd3ff128990 -r a8af78040e93 sage/quadratic_forms/extras.py /home/jonhanke/hanke_10568-10593.patch:diff -r dcd3ff128990 -r a8af78040e93 sage/quadratic_forms/ quadratic_form__local_representation_conditions.py /home/jonhanke/hanke_10568-10593.patch:diff -r a8af78040e93 -r 03e772319523 sage/quadratic_forms/ quadratic_form__local_representation_conditions.py /home/jonhanke/hanke_10568-10593.patch:diff -r 03e772319523 -r 81e8cdaeda80 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r 03e772319523 -r 81e8cdaeda80 sage/quadratic_forms/ quadratic_form__split_local_covering.py /home/jonhanke/hanke_10568-10593.patch:diff -r 81e8cdaeda80 -r fdffa9d0d082 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r 81e8cdaeda80 -r fdffa9d0d082 sage/quadratic_forms/ quadratic_form__local_field_invariants.py /home/jonhanke/hanke_10568-10593.patch:diff -r 81e8cdaeda80 -r fdffa9d0d082 sage/quadratic_forms/quadratic_form__local_normal_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r 81e8cdaeda80 -r fdffa9d0d082 sage/quadratic_forms/quadratic_form__neighbors.py /home/jonhanke/hanke_10568-10593.patch:diff -r 81e8cdaeda80 -r fdffa9d0d082 sage/quadratic_forms/quadratic_form__siegel_product.py /home/jonhanke/hanke_10568-10593.patch:diff -r 81e8cdaeda80 -r fdffa9d0d082 sage/quadratic_forms/special_values.py /home/jonhanke/hanke_10568-10593.patch:diff -r fdffa9d0d082 -r 86b10baf839d sage/quadratic_forms/count_local_2.pyx /home/jonhanke/hanke_10568-10593.patch:diff -r fdffa9d0d082 -r 86b10baf839d sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r fdffa9d0d082 -r 86b10baf839d sage/quadratic_forms/quadratic_form__count_local_2.py /home/jonhanke/hanke_10568-10593.patch:diff -r fdffa9d0d082 -r 86b10baf839d sage/quadratic_forms/quadratic_form__evaluate.pyx /home/jonhanke/hanke_10568-10593.patch:diff -r fdffa9d0d082 -r 86b10baf839d setup.py /home/jonhanke/hanke_10568-10593.patch:diff -r 86b10baf839d -r 2e8359a2caa2 sage/quadratic_forms/ quadratic_form__local_field_invariants.py /home/jonhanke/hanke_10568-10593.patch:diff -r 86b10baf839d -r 2e8359a2caa2 sage/quadratic_forms/quadratic_form__local_normal_form.py /home/jonhanke/hanke_10568-10593.patch:diff -r 86b10baf839d -r 2e8359a2caa2 sage/quadratic_forms/quadratic_form__mass__Pall_Watson.py /home/jonhanke/hanke_10595-10605.patch:diff -r 838c23c79889 -r af8e2381de74 sage/combinat/combinat.py /home/jonhanke/hanke_10595-10605.patch:diff -r 838c23c79889 -r af8e2381de74 sage/quadratic_forms/ quadratic_form__local_field_invariants.py /home/jonhanke/hanke_10595-10605.patch:diff -r 838c23c79889 -r af8e2381de74 sage/quadratic_forms/quadratic_form__mass__Pall_Watson.py /home/jonhanke/hanke_10595-10605.patch:diff -r af8e2381de74 -r 84d665877983 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10595-10605.patch:diff -r af8e2381de74 -r 84d665877983 sage/quadratic_forms/quadratic_form__mass.py /home/jonhanke/hanke_10595-10605.patch:diff -r af8e2381de74 -r 84d665877983 sage/quadratic_forms/ quadratic_form__mass__Conway_Sloane_masses.py /home/jonhanke/hanke_10595-10605.patch:diff -r af8e2381de74 -r 84d665877983 sage/quadratic_forms/quadratic_form__mass__Pall_Watson.py /home/jonhanke/hanke_10595-10605.patch:diff -r af8e2381de74 -r 84d665877983 sage/quadratic_forms/ quadratic_form__mass__Siegel_densities.py /home/jonhanke/hanke_10595-10605.patch:diff -r 84d665877983 -r f220b913963e sage/quadratic_forms/genera/genus.py /home/jonhanke/hanke_10595-10605.patch:diff -r f220b913963e -r 89dfbfb4add3 sage/quadratic_forms/quadratic_form__genus.py /home/jonhanke/hanke_10595-10605.patch:diff -r 89dfbfb4add3 -r 2ba0a32fb908 sage/quadratic_forms/binary_qf.py /home/jonhanke/hanke_10595-10605.patch:diff -r 2ba0a32fb908 -r a1629ff2b00d sage/ext/cdefs.pxi /home/jonhanke/hanke_10595-10605.patch:diff -r 2ba0a32fb908 -r a1629ff2b00d sage/rings/arith.py /home/jonhanke/hanke_10595-10605.patch:diff -r 2ba0a32fb908 -r a1629ff2b00d sage/rings/integer_mod.pxd /home/jonhanke/hanke_10595-10605.patch:diff -r 2ba0a32fb908 -r a1629ff2b00d sage/rings/integer_mod.pyx /home/jonhanke/hanke_10595-10605.patch:diff -r a1629ff2b00d -r 785353659ef5 sage/quadratic_forms/count_local_2.pyx /home/jonhanke/hanke_10595-10605.patch:diff -r 785353659ef5 -r 54be17a7adb1 sage/quadratic_forms/count_local_2.pyx /home/jonhanke/hanke_10595-10605.patch:diff -r 54be17a7adb1 -r 6cf1e6d953bd sage/quadratic_forms/count_local_2.pyx /home/jonhanke/hanke_10595-10605.patch:diff -r 6cf1e6d953bd -r 90d20410812f sage/quadratic_forms/count_local_2.pyx /home/jonhanke/hanke_10595-10605.patch:diff -r 90d20410812f -r 743b0a979a45 sage/quadratic_forms/count_local_2.pyx /home/jonhanke/hanke_10608-10628.patch:diff -r 2c7af2fc419b -r 2a1be1c57d34 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10608-10628.patch:diff -r 2a1be1c57d34 -r 91e8ea07de4e sage/quadratic_forms/all.py /home/jonhanke/hanke_10608-10628.patch:diff -r 2a1be1c57d34 -r 91e8ea07de4e sage/quadratic_forms/random_quadraticform.py /home/jonhanke/hanke_10608-10628.patch:diff -r 91e8ea07de4e -r e97435bccdd3 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10608-10628.patch:diff -r 91e8ea07de4e -r e97435bccdd3 sage/quadratic_forms/ quadratic_form__local_field_invariants.py /home/jonhanke/hanke_10608-10628.patch:diff -r e97435bccdd3 -r 054747908e10 sage/quadratic_forms/random_quadraticform.py /home/jonhanke/hanke_10608-10628.patch:diff -r 054747908e10 -r ac146e9cfb92 sage/quadratic_forms/quadratic_form__local_normal_form.py /home/jonhanke/hanke_10608-10628.patch:diff -r ac146e9cfb92 -r 84118589d58e sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10608-10628.patch:diff -r ac146e9cfb92 -r 84118589d58e sage/quadratic_forms/ quadratic_form__mass__Conway_Sloane_masses.py /home/jonhanke/hanke_10608-10628.patch:diff -r 84118589d58e -r dc97b73ebc15 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10608-10628.patch:diff -r 84118589d58e -r dc97b73ebc15 sage/quadratic_forms/quadratic_form__local_normal_form.py /home/jonhanke/hanke_10608-10628.patch:diff -r 84118589d58e -r dc97b73ebc15 sage/quadratic_forms/ quadratic_form__mass__Conway_Sloane_masses.py /home/jonhanke/hanke_10608-10628.patch:diff -r dc97b73ebc15 -r cf91d0ac2f5d sage/quadratic_forms/all.py /home/jonhanke/hanke_10608-10628.patch:diff -r dc97b73ebc15 -r cf91d0ac2f5d sage/quadratic_forms/table_conversion.py /home/jonhanke/hanke_10608-10628.patch:diff -r dc97b73ebc15 -r cf91d0ac2f5d sage/quadratic_forms/table_creation.py /home/jonhanke/hanke_10608-10628.patch:diff -r dc97b73ebc15 -r cf91d0ac2f5d sage/quadratic_forms/tables.py /home/jonhanke/hanke_10608-10628.patch:diff -r cf91d0ac2f5d -r 7f69d39c10f3 sage/quadratic_forms/tables.py /home/jonhanke/hanke_10608-10628.patch:diff -r 7f69d39c10f3 -r 9a790aca5c2c sage/quadratic_forms/all.py /home/jonhanke/hanke_10608-10628.patch:diff -r 7f69d39c10f3 -r 9a790aca5c2c sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10608-10628.patch:diff -r 7f69d39c10f3 -r 9a790aca5c2c sage/quadratic_forms/quadratic_form__local_normal_form.py /home/jonhanke/hanke_10608-10628.patch:diff -r 7f69d39c10f3 -r 9a790aca5c2c sage/quadratic_forms/ quadratic_form__mass__Conway_Sloane_masses.py /home/jonhanke/hanke_10608-10628.patch:diff -r 7f69d39c10f3 -r 9a790aca5c2c sage/quadratic_forms/tables.py /home/jonhanke/hanke_10608-10628.patch:diff -r 9a790aca5c2c -r c143cad7f58a sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10608-10628.patch:diff -r 9a790aca5c2c -r c143cad7f58a sage/quadratic_forms/quadratic_form__theta.py /home/jonhanke/hanke_10608-10628.patch:diff -r 9a790aca5c2c -r c143cad7f58a sage/quadratic_forms/quadratic_form__theta_by_cholesky.py /home/jonhanke/hanke_10608-10628.patch:diff -r c143cad7f58a -r cfcd86282dc8 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10608-10628.patch:diff -r c143cad7f58a -r cfcd86282dc8 sage/quadratic_forms/quadratic_form__automorphisms.py /home/jonhanke/hanke_10608-10628.patch:diff -r cfcd86282dc8 -r e0429544038d sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10608-10628.patch:diff -r cfcd86282dc8 -r e0429544038d sage/quadratic_forms/quadratic_form__automorphisms.py /home/jonhanke/hanke_10608-10628.patch:diff -r cfcd86282dc8 -r e0429544038d sage/quadratic_forms/quadratic_form__local_normal_form.py /home/jonhanke/hanke_10608-10628.patch:diff -r cfcd86282dc8 -r e0429544038d sage/quadratic_forms/ quadratic_form__mass__Conway_Sloane_masses.py /home/jonhanke/hanke_10608-10628.patch:diff -r cfcd86282dc8 -r e0429544038d sage/quadratic_forms/tables.py /home/jonhanke/hanke_10608-10628.patch:diff -r e0429544038d -r 535af6ad3c0c sage/quadratic_forms/all.py /home/jonhanke/hanke_10608-10628.patch:diff -r e0429544038d -r 535af6ad3c0c sage/quadratic_forms/extras.py /home/jonhanke/hanke_10608-10628.patch:diff -r e0429544038d -r 535af6ad3c0c sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10608-10628.patch:diff -r e0429544038d -r 535af6ad3c0c sage/quadratic_forms/ quadratic_form__local_field_invariants.py /home/jonhanke/hanke_10608-10628.patch:diff -r 535af6ad3c0c -r 4c62bd6af921 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10608-10628.patch:diff -r 535af6ad3c0c -r 4c62bd6af921 sage/quadratic_forms/quadratic_form__theta.py /home/jonhanke/hanke_10608-10628.patch:diff -r 4c62bd6af921 -r ea184e84f9d0 sage/quadratic_forms/quadratic_form__automorphisms.py /home/jonhanke/hanke_10608-10628.patch:diff -r ea184e84f9d0 -r 9a48d660c347 sage/quadratic_forms/quadratic_form__automorphisms.py /home/jonhanke/hanke_10608-10628.patch:diff -r 9a48d660c347 -r 19c8736a2907 sage/quadratic_forms/all.py /home/jonhanke/hanke_10608-10628.patch:diff -r 9a48d660c347 -r 19c8736a2907 sage/quadratic_forms/extras.py /home/jonhanke/hanke_10608-10628.patch:diff -r 9a48d660c347 -r 19c8736a2907 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10608-10628.patch:diff -r 9a48d660c347 -r 19c8736a2907 sage/quadratic_forms/quadratic_form__automorphisms.py /home/jonhanke/hanke_10608-10628.patch:diff -r 9a48d660c347 -r 19c8736a2907 sage/quadratic_forms/quadratic_form__genus.py /home/jonhanke/hanke_10608-10628.patch:diff -r 9a48d660c347 -r 19c8736a2907 sage/quadratic_forms/ quadratic_form__local_field_invariants.py /home/jonhanke/hanke_10608-10628.patch:diff -r 9a48d660c347 -r 19c8736a2907 sage/quadratic_forms/quadratic_form__local_normal_form.py /home/jonhanke/hanke_10608-10628.patch:diff -r 9a48d660c347 -r 19c8736a2907 sage/quadratic_forms/ quadratic_form__mass__Conway_Sloane_masses.py /home/jonhanke/hanke_10608-10628.patch:diff -r 9a48d660c347 -r 19c8736a2907 sage/quadratic_forms/quadratic_form__theta.py /home/jonhanke/hanke_10608-10628.patch:diff -r 19c8736a2907 -r dcad7b2c0a42 sage/quadratic_forms/genera/genus.py /home/jonhanke/hanke_10608-10628.patch:diff -r 19c8736a2907 -r dcad7b2c0a42 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10608-10628.patch:diff -r 19c8736a2907 -r dcad7b2c0a42 sage/quadratic_forms/quadratic_form__genus.py /home/jonhanke/hanke_10608-10628.patch:diff -r dcad7b2c0a42 -r d2b90d6cd524 sage/quadratic_forms/quadratic_form.py /home/jonhanke/hanke_10608-10628.patch:diff -r dcad7b2c0a42 -r d2b90d6cd524 sage/quadratic_forms/quadratic_form__genus.py /home/jonhanke/hanke_10608-10628.patch:diff -r d2b90d6cd524 -r 05a3db2f6057 sage/quadratic_forms/all.py /home/jonhanke/hanke_10608-10628.patch:diff -r d2b90d6cd524 -r 05a3db2f6057 sage/quadratic_forms/genera/all.py /home/jonhanke/hanke_10608-10628.patch:diff -r d2b90d6cd524 -r 05a3db2f6057 sage/quadratic_forms/genera/genus.py /home/jonhanke/hanke_10608-10628.patch:diff -r d2b90d6cd524 -r 05a3db2f6057 sage/quadratic_forms/quadratic_form__automorphisms.py /home/jonhanke/hanke_10608-10628.patch:diff -r d2b90d6cd524 -r 05a3db2f6057 sage/quadratic_forms/quadratic_form__genus.py /home/jonhanke/hanke_10608-10628.patch:diff -r d2b90d6cd524 -r 05a3db2f6057 setup.py I am not sure how to proceed from here. We could copy over the vast majority of files from Jon's directory and check them in again and then apply the diffs to the common files. The only file that has a potential conflict is genera/genus.py. Cheers, Michael --~--~---------~--~----~------------~-------~--~----~ 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/sage-devel URLs: http://www.sagemath.org -~----------~----~----~----~------~----~------~--~---
