> -----Original Message-----
> From: Walser Markus [mailto:markuswal...@schleuniger.ch]
> Sent: maandag 10 mei 2010 14:56
> To: Bert Huijben; users@subversion.apache.org
> Subject: AW: Automatically merge of new binary file.
>
> Hi Bert
>
> Sorry I forgot this important information:
>
> It was Tortoise 1.6.8 Build 19260 (SVN 1.6.11).
In that case I would recommend sending a mail to
users{_AT_}tortoisesvn.tigris.org instead of this list, as it would have to
be fixed in TortoiseSVN.
Thanks,
Bert
>
> Regards,
>
>
> Markus
>
> -----Ursprüngliche Nachricht-----
> Von: Bert Huijben [mailto:b...@qqmail.nl]
> Gesendet: Montag, 10. Mai 2010 14:53
> An: Walser Markus; users@subversion.apache.org
> Betreff: RE: Automatically merge of new binary file.
>
>
>
> > -----Original Message-----
> > From: Walser Markus [mailto:markuswal...@schleuniger.ch]
> > Sent: maandag 10 mei 2010 14:25
> > To: users@subversion.apache.org
> > Subject: Automatically merge of new binary file.
> >
> > Hi
> >
> > Recently I ran into following subversion use case:
> >
> > 1. A new binary file was created in a working copy 1 and *not* added:
> > e.g. C:\Test\WorkingCopy1\BinaryFile.pdf
> >
> > 2. In another working copy 2 of the same repo another binary file with
> > the same filename but different content was created and added:
> > e.g. C:\TestWorkingCopy2\BinaryFile.pdf. Thereby SVN correctly set
> > the mime type to octet.
> >
> > 3. The newly added file was committed in working copy 2.
> >
> > 4. Working copy 1 is updated.
> >
> >
> > What happens is that SVN reports successful merging of BinaryFile.pdf.
> >
> > I'd rather expected a conflict with the local BinaryFile.pdf instead
> > of trying to merge the binary file.
> >
> > Is that binary merging behavior as designed or a know bug?
>
> Which client did you use? (And which version)
>
> TortoiseSVN always uses "svn update --force" (taking unversioned
> obstructions as the new version of the same file) so this would give this
> behavior.
>
> Bert
