Lock merge function into working copy
From: Bernard TREMBLAY <bty-adminf1_at_trebly.net>
Date: Sat, 19 Feb 2011 08:30:32 -0800 (PST)
Into the FAQ we can find the subject :
Some people don't like the fact that Subversion merges changes from others with their own local working copy changes automatically on update. Here's how to force those files into a conflicted state so you can merge manually at your convenience.
1. In TortoiseSVN->Settings->Subversion configuration file, click on the edit button.
This effectively makes auto-merge fail every time, forcing the file into conflict.
The reason for the curious 'type %9' line is that the diff3-cmd sends the merged output to stdout. Subversion then takes this and overwrites your local file with the merge results. Adding this line avoids getting an empty local file.
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.
Then the lonely way to work is to lock the merge on the local worked copy and get the new updated into a <filename-with-.extension>.<new version>.<file extension> to make comparisons and solve manually conflict.
Why such a name for the update file (new version not merged) ?
In another way there is a locking problem is that the expression :
So it is a dead lock.
A rule "never use words or expressions" in any DOC or FAQ which don't gives as result the lonely text you have just redacted : this creates a "closed semantic space" for users.
I y resume :
1- Where do we find an [helpers] section
For the moment I need before an SVN update I need :
2- Delete the main files
3- Update and for each "new" file create a versioned copy. and delete the original one
4- Copy the first (mine) to the file name
5- Make a comparison for each one (sometime 50 files)
During this time there is no chance to make any significant test or other work on the product which can't function.
For the moment I have 67 files in such conflict, 12 declared conflicts on the 7484 files (TPL,PHP,CSS,JS)
Most of time TPL (smarty) and CSS can't be merged automatically (near 70%).
This takes half time of development.
the need is
2- to keep named (renamed) conflicted versions
Sorry if I have been long. But for the moment, I develop nothing because my development are concerning crossed parts of projects.
Thanks for your answer
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
This is an archived mail posted to the TortoiseSVN Users mailing list.