On Aug 18, 2010, at 8:31 PM, Ondrej Certik wrote: > On Wed, Aug 18, 2010 at 3:04 PM, Aaron S. Meurer <asmeu...@gmail.com> wrote: >> >> On Aug 18, 2010, at 3:29 PM, Brian Granger wrote: >> >>> On Wed, Aug 18, 2010 at 2:22 PM, Ondrej Certik <ond...@certik.cz> wrote: >>>> Hi Brian, Matt and Addison, >>>> >>>> I think the discussion wandered a bit from the review. >>>> >>>> 1) Git history: >>>> >>>> Do you want to keep your history? Does the history bring any value to >>>> sympy? From what I understood, many times it doesn't import, or tests >>>> don't pass. So it seems to me there isn't really any value in keeping >>>> the history, is there? >>> >>> Yes, the history is quite important and I don't see it as an option to >>> erase it. The reason is attribution and authorship. Each of the 3 of >>> us authored parts of the branch that is submitted for review and that >>> information needs to be preserved for copyright/licensing reasons. It >>> is also important from the standpoint of GSoC legalities, for which we >>> need to know which student did what. >> >> You're right. Even if you rebase, all the diff files for the GSoC code >> samples should come from the last HEAD before 2 pm Pacific last Monday. And >> I would be opposed to creating a single patch that removes the information >> on who created what (now if there were only one author, it might be a >> different story, but in that case, there wouldn't be so many merge commits >> anyway) >> >> So you don't care about commit HEADs that don't even import correctly. >> That's fine. from sympy import * still works, so it is you who will have to >> deal with the consequences for the future maintenance of the code. (at >> least personally I don't care about it, since I don't even know anything >> about quantum mechanics :) >> >> But you can still go back and fix commit messages, without changing any of >> the actual code history. It shouldn't cause any problems with the merge >> commits, because only the messages will change. Just use the fixup option >> in git rebase -i in a recent version of git. I would highly recommend doing >> this. These are for the benefit of other people, and also for your own >> future self. You may remember what the "Fixed stuff" commit did now, but I >> guarantee you that you will not remember it a year from now, or even a few >> months. But if there are more descriptive commit messages, you won't even >> have to remember what it did, because it will tell you (though the irony is >> that you probably will remember in that case, because of the more unique and >> logical message). I would give the same advice that I gave to Christian, >> which is to back port some of your descriptions from your blog posts into >> the commit messages (or alternately, you could put these in that doc file >> some people have suggested). > > Thanks Aaron, I was just going to write the same thing. In particular, > commits like this: > > 080362d (DId nothing basically, 2010-08-02) > > really doesn't make any sense to me. > > I am worried that "git rebase -i" can't handle merges in branches, can it?
Ah, it seems that it doesn't. I tried "git rebase -i HEAD~100" it as a test on their branch, doing only a reword on the above named commit, and it converted the branch into a linear history. It also asked for me about merge conflicts for each merge commit (I just chose whatever default resolution git mergetool gave me). You can see what it look like here (view in gitk or some similar to see how the history looks): http://github.com/asmeurer/sympy/tree/hilbert2-test The -p option to git rebase is supposed to preserve merges, but the man page recommends not including it with —interactive. I went ahead and tried that, and it seemed to work. You can see the result here (http://github.com/asmeurer/sympy/tree/hilbert2-test, again, compare to the original hilbert2 in gitk). It also made me go through the merge commits again in this, but I just used the default from git mergetool again (there is probably a git command to do this too, but I don't know what it is, or maybe if you have been using git rerere, it won't make you do that). And for the record, I meant to say "reword," not "fixup." The fixup option is for easy squashing. Aaron Meurer > > > Also, currently the branch fails some tests for me: > > > ond...@crow:~/repos/sympy((1b88f9b...))$ bin/test sympy/physics/ > ============================= test process starts > ============================== > executable: /usr/bin/python (2.6.4-final-0) > > sympy/physics/tests/test_clebsch_gordan.py[3] ... > [OK] > sympy/physics/tests/test_hilbert.py[?] Failed to import > [FAIL] > sympy/physics/tests/test_hydrogen.py[2] .. > [OK] > sympy/physics/tests/test_paulialgebra.py[1] . > [OK] > sympy/physics/tests/test_physics_matrices.py[2] .. > [OK] > sympy/physics/tests/test_qbit.py[?] Failed to import > [FAIL] > sympy/physics/tests/test_qops.py[?] Failed to import > [FAIL] > sympy/physics/tests/test_quantum.py[?] Failed to import > [FAIL] > sympy/physics/tests/test_secondquant.py[24] ........................ > [OK] > sympy/physics/tests/test_shor.py[?] Failed to import > [FAIL] > sympy/physics/tests/test_units.py[1] . > [OK] > > ________________________________________________________________________________ > _________ /home/ondrej/repos/sympy/sympy/physics/tests/test_hilbert.py > _________ > File "/home/ondrej/repos/sympy/sympy/physics/tests/test_hilbert.py", > line 1, in <module> > from sympy.physics.hilbert import l2, L2, FockSpace, > TensorProductHilbertSpace,\ > File "/home/ondrej/repos/sympy/sympy/physics/hilbert.py", line 2, in <module> > from sympy.physics.quantumbasic import QuantumError > ImportError: No module named quantumbasic > ________________________________________________________________________________ > __________ /home/ondrej/repos/sympy/sympy/physics/tests/test_qbit.py > ___________ > File "/home/ondrej/repos/sympy/sympy/physics/tests/test_qbit.py", > line 1, in <module> > from sympy.physics.qbit import * > File "/home/ondrej/repos/sympy/sympy/physics/qbit.py", line 1, in <module> > from sympy.physics.hilbert import l2, HilbertSpaceException > File "/home/ondrej/repos/sympy/sympy/physics/hilbert.py", line 2, in <module> > from sympy.physics.quantumbasic import QuantumError > ImportError: No module named quantumbasic > ________________________________________________________________________________ > __________ /home/ondrej/repos/sympy/sympy/physics/tests/test_qops.py > ___________ > File "/home/ondrej/repos/sympy/sympy/physics/tests/test_qops.py", > line 1, in <module> > from sympy.physics.quantum import ( > File "/home/ondrej/repos/sympy/sympy/physics/quantum.py", line 3, in <module> > from sympy.physics.quantumbasic import QuantumError, QuantumBasic > ImportError: No module named quantumbasic > ________________________________________________________________________________ > _________ /home/ondrej/repos/sympy/sympy/physics/tests/test_quantum.py > _________ > File "/home/ondrej/repos/sympy/sympy/physics/tests/test_quantum.py", > line 1, in <module> > from sympy.physics.quantum import ( > File "/home/ondrej/repos/sympy/sympy/physics/quantum.py", line 3, in <module> > from sympy.physics.quantumbasic import QuantumError, QuantumBasic > ImportError: No module named quantumbasic > ________________________________________________________________________________ > __________ /home/ondrej/repos/sympy/sympy/physics/tests/test_shor.py > ___________ > File "/home/ondrej/repos/sympy/sympy/physics/tests/test_shor.py", > line 1, in <module> > from sympy.physics.qbit import * > File "/home/ondrej/repos/sympy/sympy/physics/qbit.py", line 1, in <module> > from sympy.physics.hilbert import l2, HilbertSpaceException > File "/home/ondrej/repos/sympy/sympy/physics/hilbert.py", line 2, in <module> > from sympy.physics.quantumbasic import QuantumError > ImportError: No module named quantumbasic > > =========== tests finished: 33 passed, 5 exceptions, in 5.98 seconds > =========== > DO *NOT* COMMIT! > > > Ondrej > > -- > You received this message because you are subscribed to the Google Groups > "sympy-patches" group. > To post to this group, send email to sympy-patc...@googlegroups.com. > To unsubscribe from this group, send email to > sympy-patches+unsubscr...@googlegroups.com. > For more options, visit this group at > http://groups.google.com/group/sympy-patches?hl=en. > -- You received this message because you are subscribed to the Google Groups "sympy-patches" group. To post to this group, send email to sympy-patc...@googlegroups.com. To unsubscribe from this group, send email to sympy-patches+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/sympy-patches?hl=en.
