Re: Resolving conflicts during merge - could not postpone all

Mark Phippard <markphip_at_gmail.com> writes:

> My "trunk" working copy had the WC upgraded by running the JavaHL test
> suite. I can live with it, but it means I have to change PATH before
> updating my WC. I've been doing this for a long time now, but for
> some reason sometimes I get weird results. For example, I can do
> this:
>
> $ export PATH=/tmp/svn/bin:$PATH
>
> $ which svn
> /tmp/svn/bin/svn
>
> But when I run svn up or svn --version I am getting the 1.7.x version
> instead. This does not always happen, but it is something that only
> just started happening in the last few months. Since I usually only
> need to run update, it is not that big of a deal so I have never spent
> any time on it.

When using a shell like bash each instance keeps a in-memory hash table
of commands that have been found. If you ran the 1.7 svn before
changing PATH it's possible the shell instance is finding svn in its
hash and not searching PATH. In bash you can use "hash -r" to cause
the shell instance to clear its hash, or "hash -r svn" to clear just one
command.

-- 
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download