So, I still haven't worked through the Mercurial tutorial. You can tell me to RTFM for Mercurial. But I just did;
hg pull http://hg.sympy.org/sfepy hg update
and then this prints to my screen (from the top of ls.py):
from sfe.base.base import * from sfe.solvers.solvers import LinearSolver
import scipy <<<<<<< /home/ryan/svn/sfepy/sfe/solvers/ls.py.orig. if (scipy.version.version == "0.6.0") or (scipy.version.version < '0.7.0.dev3861'): ||||||| /tmp/ls.py~base.M22101 if scipy.version.version == "0.6.0":
if scipy.version.version < '0.7.0.dev3861':
> /tmp/ls.py~other.1P46Qk
So, I think that means the top one is mine, the middle is the old, and the bottom is the repository. I think this means I need to configure the diff tool the Mercurial uses. What do you guys use? And is there an hg update flag to overwrite all my local changes with the repo changes? Right now when I run "hg update", it is just displaying the python file in my terninal with no syntax highlighting and no commands to merge the changes one way or another.
Thanks again,
Ryan
On Mon, Jun 23, 2008 at 10:40 AM, Robert Cimrman <cimr...@ntc.zcu.cz> wrote:
Ryan Krauss wrote:
Cool. Thanks for your perserverance Roboert. I also need to make the same change on line 74 of ls.py:
Funny, I fixed the line 74, but missed the top of the file. It should be ok in our repo now.
p.s. I can stay with this svn revision of scipy for a while if it is helpful for debugging, or I can update.
As you wish :) Anyway, debugging help is always welcome, thanks!
r.