[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merge problem

From: <kfogel_at_collab.net>
Date: 2004-10-29 14:45:01 CEST

barry burnereau <barry_burnereau@yahoo.fr> writes:
> 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

I cannot reproduce this problem as described, using svn version
1.2.0 (dev build, appx r11613).

If you could please write a small program that demonstrates the
problem, or give a *very* detailed transcript of what you did --
including the exact file contents and every Subversion command -- that
would help a lot. That is our preferred way to receive bug reports;
it saves us a lot of time. To be specific, I spent 30 minutes writing
a shell script (see http://www.red-bean.com/kfogel/repro.sh), which
did not reveal the bug :-). Maybe my script does not do exactly what
you did, I don't know.

Thank you,
-Karl

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Oct 29 16:38:35 2004

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.