Re: Merge problem

Hi again

This is an example of the problem:
My file contain that:
<!-- élément de base -->
After an update with an automatic merge
I have:
<!-- élément de base -->

If there is no automatic merge, there is no pb with
the "é".

I'm under windows XP, I use svn 1.1.1

Thank's for your help

Barry

 --- barry burnereau <barry_burnereau@yahoo.fr> a
écrit :
> Hello
>
> I have a problem with svn update. Some files are
> automatically merged. But some french character like
> "é" or "è" are changes by strange char.
>
> So I have two questions:
> - Is it possible to desactivate automatic merge, and
> to say that every file modified by someone that i
> have
> modified too are conflicted ?
> - Is there a way not to change "é" or "è" or ...
> during merge ?
>
>
> Barry
>
>

        
                
Vous manquez d’espace pour stocker vos mails ?
Yahoo! Mail vous offre GRATUITEMENT 100 Mo !
Créez votre Yahoo! Mail sur http://fr.benefits.yahoo.com/

Le nouveau Yahoo! Messenger est arrivé ! Découvrez toutes les nouveautés pour dialoguer instantanément avec vos amis. A télécharger gratuitement sur http://fr.messenger.yahoo.com

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Oct 26 15:28:05 2004