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

RE: Re: Lock merge function into working copy

From: Bernard TREMBLAY <bty-adminf1_at_trebly.net>
Date: Sun, 20 Feb 2011 20:47:18 -0800 (PST)

Hi,
Thanks, I really had not seen at all the first line...

In my question there was as second one :
- Can we change the name of file file update when there is a conflict. It should be usefull to be named

<main file name with extension>.<version>.<extension>

I need for comaparison with syntax enhancement to had the extension. May be this can have an action on the conflict solving process when we sue the SVN compare.

Another question : should it be possible to lock the merge only for a list of file Files.
I imagine that dcc and dcc3 supports cmd files then and adapted syntax could probably lock the merged only for desired files.

I hope that I am right

Best regards

Trebly

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-02-21 05:47:22 CET

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

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