[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Resolving conflicts during merge - could not postpone all

From: Ben Reser <ben_at_reser.org>
Date: Tue, 19 Feb 2013 10:54:03 -0800

On Mon, Feb 18, 2013 at 10:36 AM, Mark Phippard <markphip_at_gmail.com> wrote:
> 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.

I think that Phillip already explained the problem you're having but
I'll explain what I do to handle working with multiple different svn
versions.

I have a symlink for various versions to my build tree on my path (in
my case ~/bin) e.g.
svn-trunk -> ~/builds/svn-trunk/subversion/svn/svn
svn-1.7 -> ~/builds/svn-1.7.x/subversion/svn/svn

If I want to use trunk I can just type svn-trunk. If I'm going to
want to use trunk for a number of commands I can do:
alias svn=svn-trunk

and I can go back with:
unalias svn

Much easier than messing with PATH and makes it easy to run one off
commands with various versions.
Received on 2013-02-19 20:01:24 CET

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.