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

Keep file extensions on conflict

From: Ed Waugh <ed_at_edwaugh.co.uk>
Date: Fri, 17 Dec 2010 03:53:10 -0800 (PST)

Hi everyone,

I'm not sure if this can already be done or if it is a feature request.

When there is a conflict tortoiseSVN helpfully creates additional copies of the conflicted files representing different versions with the file extension .r35 .r34 etc. This is fine when working with code, and the diff editor that understands them, but when using other formats it can be a pain.

We keep all kinds of binary files under subversion control including word documents. Word actually has quite a good compare/merge tool built in, but to persuade it to open the files I normally end up changing their filenames by hand back to docx. Is it possible to have tortoise create files with the naming convention:

That would make this process much easier, for me at least!

Thanks very much

Ed Waugh


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-12-17 12:53:18 CET

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