You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by "hubert.loewenguth" <hu...@thales-bm.com> on 2006/06/01 14:29:43 UTC
problem during a merge
Hello to the community
I have an error during a merge and I don't understand the meaning of
this error.
I'm trying to apply the modifications done on a trunk to my local
working branch :
svn merge -r 25:150 https://ipadress/therepository/trunk/src ./my_branch/src
Everything works fine untill the merge process is trying to work with a
new file added in the https main repository.
The merge operation stop giving me this message:
"svn : Schemas d'accession mixtes non encore supportés"
What we can try to translate into something like:
"svn: schemas of mixte accession not yet supported".
Does anybody knows what this message means ?
Thanks for any help
Re: problem during a merge
Posted by Andreas Pakulat <ap...@gmx.de>.
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
Re: problem during a merge
Posted by "hubert.loewenguth" <hu...@thales-bm.com>.
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 ?
AnyOne already in front of this problem ?
hubert.loewenguth a écrit :
> An other information:
>
> Here is the original message in english of my error:
>
> "Access scheme mixtures not yet supported"
>
> Any Idea of what I'm doing wrong ?
>
> hubert.loewenguth a écrit :
>
>> Hello to the community
>>
>> I have an error during a merge and I don't understand the meaning of
>> this error.
>>
>> I'm trying to apply the modifications done on a trunk to my local
>> working branch :
>> svn merge -r 25:150 https://ipadress/therepository/trunk/src
>> ./my_branch/src
>> Everything works fine untill the merge process is trying to work with
>> a new file added in the https main repository.
>> The merge operation stop giving me this message:
>>
>> "svn : Schemas d'accession mixtes non encore supportés"
>>
>> What we can try to translate into something like:
>> "svn: schemas of mixte accession not yet supported".
>>
>> Does anybody knows what this message means ?
>>
>> Thanks for any help
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: users-help@subversion.tigris.org
>>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>For additional commands, e-mail: users-help@subversion.tigris.org
>
Re: problem during a merge
Posted by "hubert.loewenguth" <hu...@thales-bm.com>.
An other information:
Here is the original message in english of my error:
"Access scheme mixtures not yet supported"
Any Idea of what I'm doing wrong ?
hubert.loewenguth a écrit :
> Hello to the community
>
> I have an error during a merge and I don't understand the meaning of
> this error.
>
> I'm trying to apply the modifications done on a trunk to my local
> working branch :
> svn merge -r 25:150 https://ipadress/therepository/trunk/src
> ./my_branch/src
> Everything works fine untill the merge process is trying to work with
> a new file added in the https main repository.
> The merge operation stop giving me this message:
>
> "svn : Schemas d'accession mixtes non encore supportés"
>
> What we can try to translate into something like:
> "svn: schemas of mixte accession not yet supported".
>
> Does anybody knows what this message means ?
>
> Thanks for any help
>
>
>
>---------------------------------------------------------------------
>To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>For additional commands, e-mail: users-help@subversion.tigris.org
>
Re: problem during a merge
Posted by Ryan Schmidt <su...@ryandesign.com>.
On Jun 1, 2006, at 16:29, hubert.loewenguth wrote:
> I have an error during a merge and I don't understand the meaning
> of this error.
>
> I'm trying to apply the modifications done on a trunk to my local
> working branch :
> svn merge -r 25:150 https://ipadress/therepository/trunk/src ./
> my_branch/src
> Everything works fine untill the merge process is trying to work
> with a new file added in the https main repository.
> The merge operation stop giving me this message:
>
> "svn : Schemas d'accession mixtes non encore supportés"
>
> What we can try to translate into something like:
> "svn: schemas of mixte accession not yet supported".
>
> Does anybody knows what this message means ?
Yes. Your working copy is presumably checked out using http (verify
this using "svn info" on your working copy) and now you're trying to
merge in a change over https, and this difference of schemes (http
vs. https) is not supported. Use the same scheme (http) when doing
the merge, or "svn switch --relocate" the working copy to the https URL.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org