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

Re: Keep file extensions on conflict

From: Andreas Stieger <andreas.stieger_at_gmx.de>
Date: Fri, 17 Dec 2010 12:02:34 +0000

Hi,

On 17/12/2010 11:53, Ed Waugh wrote:

> 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:
> originalfilename_r##.originalext
> e.g.
> originalworddoc_r35.docx
>
> That would make this process much easier, for me at least!

TortoiseSVN already does that, just right-click edit conflicts and it
will call the document merge view with the conflicted files for you.
Also see Tortoise SVN Settings / External Programs / Merge Tool /
Advanced. As for the file extensions, that's probably part of the svn
library, not TortoiseSVN.
Also consider lock communication on non-code files using svn:needs-lock
properties and separating the text processing part from the DTP part
when working on documents, e.g. LaTeX.

With kind regards,
Andreas Stieger

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2691429

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

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