Re: Lock merge function into working copy

> Into the FAQ we can find the subject :
> prevent Subversion from doing automatic merges?
> <snip>
> This is very usefull because when you use templates (smarty) and css
> any merge can generate a lot of work to make a manual merge and
> generally you have lost your original file.

If the merging is going to break your files, why are they not marked
as svn:needs-lock?

> - 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>

Did you read what Stefan said? TortoiseSVN has nothing to do with the
names of the conflict files. If you want that changed, you need to ask
the Subversion devs, not the TortoiseSVN devs.

> 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 imagine that would be possible. Assuming you desire that behaviour,
why don't you try your suggestion and see what happens?

Dale McCoy

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-02-21 16:26:34 CET