[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: Wed, 23 Feb 2011 18:11:52 -0800 (PST)

Hi,

Thank you very much. I had rarely so clear and quick answers.

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

Because I am working on my work space and others developers are working on projects which don't generate conflicts most of time, and who works and changes on the same file as I do, some (50) files pertains to several projects. We decide to create an "experimental branch" for my projects into the main repository. So it will be possible to others to make test with my branch. There are really great differences in the way to solve some problems (particularly with css and the calling templates written with smarty). And my project are not ready to be merged with trunk.
But as I can't, at all, be disconnected of the others developments I must lock merge (any update) on my projects but too integrate the others that are not in my space. After commit into my experimental branch. I have established the list of scripts that must be protected from merge. At a moment a fusion will be made after technical choices on a limited space of files.

2- Where can I find informations about the parameters of the "false.bat" so that it could not lock automatically the merge for all files. I imagine that
  1- the batch is executed for each file to merge
  2- you get the errorlevel correcponding to the exit 1. If my batch returns exit 0 or other, what happens ? may be here is a solution. The fail.bat exit with errorlevel 1 it could with another if the merge can be done.
It is my job to manage these files (an automatic writing can be made from project files of the editor (I can set the file into a special folder and treat the files by batch or cmd so that the exit code will be different). I need to know which are the parameter of fail.bat (or other name), particularly the filename to compare to the list and generate the exist code.

I believe that it is an available solution for the purpose.
I will redact a document for FAQ and samples with code.

I have not been able to find myself information about this.

What's your opinion ?

Best regards

Trebly

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-02-24 03:11:55 CET

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