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

Re: Binary conflicts

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Tue, 28 Apr 2009 18:48:42 +0200

Bolstridge, Andrew wrote:
> Hi all.
> TortoiseSVN is a brilliant tool, I love it, but I’ve found one
> niggle in the UI that I think could be improved.
> When updating a folder, if you get a conflict on a binary file,
> TSVN basically says “whuu I dunno” and leaves you with a relatively
> dissatisfied feeling that it hasn’t helped you sort out the problem.
> (this is especially noticeable if you replace the TortoiseMerge tool
> with another one, like Winmerge, which simply prompts you for another
> file to compare).
> In the past, I’ve noticed there is a dialog that helps you
> resolve conflicts – it had 6 buttons the middle two of which were “use
> mine” and “use theirs”. Why doesn’t the ‘resolve conflict’ option invoke
> this dialog and give you an easy way to revert or keep which binary file
> you want?
> I know the manual says
> “If you have conflicts with binary files, Subversion does not attempt to
> merge the files itself. The local file remains unchanged (exactly as you
> last changed it) and you have filename.ext.r* files. If you want to
> discard your changes and keep the repository version, just use the
> Revert command. If you want to keep your version and overwrite the
> repository version, use the Resolved command, then commit your version.”
> That’s fair enough, don’t try to merge them (except it kind of
> does as I see the Merge dialog pop up and then disappear). I think it
> would be much better if the ‘edit conflicts’ allowed you to resolve the
> conflict instead of you having to know not to manually deal with it in
> the case of a binary file.
> BTW, the file in question that prompted this is a windows dll,
> the svn mime-type property is application/octet-stream.

See here:


  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

Received on 2009-04-28 18:48:56 CEST

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