Ok, it now seems I'm lost in the world of git. I did the git rebase mentioned above, and in the process I think I lost a couple of imports, which I then re-added to get the tests to pass. After having made some changes of my own to other parts of the code, I committed, but when I try to push this commit I get:
! [rejected] represent -> represent (non-fast-forward) error: failed to push some refs to '[email protected]:lazovich/sympy.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details. Some googling has told me that this can happen if you accidentally obliterate something during a rebase, but it seems the only way to get around it is to use the --force handle on the push. Is there any other way to remedy this on my end? I'm afraid that using --force will obliterate something else on the remote end. Thanks for helping a git noob! Tomo On Tue, Jun 21, 2011 at 3:23 PM, Tomo Lazovich <[email protected]>wrote: > Ah it seems I lost the ordered_iter at some point during rebasing. Thanks! > > > On Tue, Jun 21, 2011 at 3:18 PM, Renato Coutinho < > [email protected]> wrote: > >> Hi, >> >> On Tue, Jun 21, 2011 at 5:09 PM, Tomo Lazovich <[email protected]> >> wrote: >> > Hello sympy-folk, >> > >> > I just pulled a fresh master and then did a git rebase on one of my >> > branches. After I did the rebase, I ran the tests and got a few >> failures. >> > I'm running Python 2.6.2 on Mac OS X. They all seemed to be related to >> > ordered_iter. Is this a problem on my end or something bad in master? >> Output >> > below: >> > >> > >> ________________________________________________________________________________ >> > _________________ sympy/core/tests/test_functions.py:test_Subs >> > _________________ >> > File "/users/lazovich/sympy/sympy/core/tests/test_functions.py", line >> 167, >> > in test_Subs >> > assert Subs(f(x), x, 0).doit() == f(0) >> > File "/Users/lazovich/sympy/sympy/core/function.py", line 904, in >> __new__ >> > if not ordered_iter(variables, Tuple): >> > NameError: global name 'ordered_iter' is not defined >> > >> ________________________________________________________________________________ >> > ________________ sympy/core/tests/test_functions.py:test_deriv1 >> > ________________ >> > File "/users/lazovich/sympy/sympy/core/tests/test_functions.py", line >> 251, >> > in test_deriv1 >> > assert f(g(x)).diff(x) == Derivative(g(x), x)*Subs(Derivative(f(x), >> x), >> > File "sympy/core/expr.py", line 1832, in diff >> > return Derivative(self, *new_symbols, **assumptions) >> > File "/Users/lazovich/sympy/sympy/core/function.py", line 683, in >> __new__ >> > obj = expr._eval_derivative(s) >> > File "/Users/lazovich/sympy/sympy/core/function.py", line 274, in >> > _eval_derivative >> > df = self.fdiff(i) >> > File "/Users/lazovich/sympy/sympy/core/function.py", line 519, in >> fdiff >> > arg_dummy), arg_dummy, self.args[argindex-1]) >> > File "/Users/lazovich/sympy/sympy/core/function.py", line 904, in >> __new__ >> > if not ordered_iter(variables, Tuple): >> > NameError: global name 'ordered_iter' is not defined >> > >> ________________________________________________________________________________ >> > _________ sympy/printing/pretty/tests/test_pretty.py:test_pretty_Subs >> > __________ >> > File >> "/users/lazovich/sympy/sympy/printing/pretty/tests/test_pretty.py", >> > line 2458, in test_pretty_Subs >> > expr = Subs(f(x), x, ph**2) >> > File "/Users/lazovich/sympy/sympy/core/function.py", line 904, in >> __new__ >> > if not ordered_iter(variables, Tuple): >> > NameError: global name 'ordered_iter' is not defined >> >> Those are all happening on the same line in function.py. ordered_iter >> is imported at the top of that file, line 42 in master: >> >> from sympy.core.compatibility import iterable, ordered_iter >> >> Are you sure you kept this line when rebasing? >> >> Renato >> >> -- >> You received this message because you are subscribed to the Google Groups >> "sympy" group. >> 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/sympy?hl=en. >> >> > > > -- > Tomo Lazovich > Harvard College '11 > 278 Winthrop House Mail Center > Cambridge, MA 02138 > -- Tomo Lazovich Harvard College '11 278 Winthrop House Mail Center Cambridge, MA 02138 -- You received this message because you are subscribed to the Google Groups "sympy" group. 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/sympy?hl=en.
