I think this is a bug in 1.1.1
I have switch back to 1.0.9, I don't have this
problem.
The scenario is this one:
2 users:
A make an update
B make an update
A modify a file (F) which contain é or è or à ...
B modify the same file(F), but in a different zone
A commit
B update
in the file F (automatically merged), all the
character like é or è or à are changed by strange char
Barry
--- barry burnereau <barry_burnereau@yahoo.fr> a
écrit :
> 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 17:26:03 2004