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

Re: Bug in resolving Uninicode files

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Fri, 15 Aug 2008 10:39:53 +0200

Anthony Winner wrote:
> I recently updated to TSVN 1.5.2 (I skipped the other 1.5.x versions)
> from 1.4.x. Recently after a merge I was resolving a conflict on a
> Unicode file, I was able to pick and choose the right parts of the file,
> but when I went to save the changes, it always came up as a ‘save as’,
> and it was pointed to my documents folder not the folder the file came
> from, also the file name was blank. I know I have done this under the
> old 1.4.x versions with no problem, so it’s something new in 1.5. Also I
> was able to resolve other files in the same folder with no problems so
> it is limited to Unicode files.

TortoiseMerge does not differ between files in unicode or ascii (besides
when loading/showing them). The merging/saving is done independent of
the file encoding.
Are you using TortoiseMerge to resolve your conflicts?
How do you start the "resolve" operation? From the explorer context menu
"Edit conflicts"? Or from a dialog?

Stefan

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net

Received on 2008-08-15 10:40:18 CEST

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