No problem. That is what I was doing (manual editting). I just thought there had to be an easier way.

Thanks again for all your help,

Ryan

On Mon, Jun 23, 2008 at 11:24 AM, Robert Cimrman <cimr...@ntc.zcu.cz> wrote:

Ryan Krauss wrote:

...

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

This is caused by the fact that I fixed the problem in a slightly different way then I posted here.

...

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.

So, this is normal - it occurs whenever your local changes are in conflict with the repository you pull from. In this case just: a) manually remove <<< and |||, === is the upstream version, or b) remove whole ls.py and pull again, or c) clone the whole repo again (just if you can safely remove the directory)

cheers, and sorry for the troubles :) r.

...