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

Properties and conflicts

From: Hans-Emil Skogh <Hans-Emil.Skogh_at_tritech.se>
Date: 2006-05-03 13:39:38 CEST

Hi yet again! :-)
If there's a conflict between properties on an update, a file called *.prej is created containing a textual description of the problem. TSVN does not seem to honour this in a sensible way:
- In the update dialog the regular conflict-context-menu is available, but the choices makes no sense. I would suggest removing all menu items there except for "Show log" and add an item "Show conflict description" (or similar) that would launch the prej-file in a text-editor (or similar).
- Right-clicking on the file in explorer has pretty much the same problems. "Edit conflicts" is available but does nothing.
On a side note, the *.prej-file does not behave very nicely when binary properties are used. I guess this is a known problem in the SVN-camp, but if not maybe Stefan you could drop a hint of how you handled it in TSVN. Printing raw binary data into presumable text files does not taste that good... :-P
Received on Wed May 3 13:39:51 2006

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

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