Re: Resolving conflicts during merge - could not postpone all

On Mon, Feb 18, 2013 at 12:44 PM, Stefan Sperling <stsp_at_elego.de> wrote:

> Typing 'enter' also postpones here.
> But answering 'q' works for me before and after r1447398, on OpenBSD.
> (Except that typing backspace doesn't erase characters at the prompt :-( )
>
> Which platform are you on? Windows?
> Is it possible that the new code added for prompting on the terminal
> is responsible for this?

I am on OSX. I will try clean etc. and let you know.

I have actually been having a weird problem recently that maybe
someone can shed ideas on.

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.

-- 
Thanks
Mark Phippard
http://markphip.blogspot.com/