Re: problem during a merge

On 01.06.06 16:41:01, hubert.loewenguth wrote:
>
> An other information:
>
> My local branch work with svn access, and the main repository has now migrate
> to a https access.
> Perhaps this is the reason ?

Right. You cannot mix them. If it's the same repository first switch
your local working copy to the https:-url using svn switch (possibly
with the --relocate option) and then try to merge.

Andreas

-- 
Don't look back, the lemmings are gaining on you.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org