|
[
Permlink
| « Hide
]
Dan Tran added a comment - 23/Jan/06 09:34 PM
What happen to your case is:
Hi,
also for me a better flexibility in scm plugin configuration can be achieved using parameters to add to command line. For example I've a project configured under StarTeam that always ask the active item when I do a checkin, so the only way to perform such action is add the -active argument to command line. I honestly do not undertand and get the point of the previous comment.
The functionality to add command line parameters for the stcmd checkout command would be useful. thank you the merge param is used during "scm's update" only, not during the first checkout. Also according to me experience the merge is required in order to get the update to work when there are file changes in starteam server. You can help by taking out the merge and replace the jar with the one
in your continuum to see if it still works The merge param is used also on the first checkout. Anyway, this doesnt matter that much, since when you first checkout a project, the working folder is empty
The issue arises when you do subsequent builds, then it is used the -merge option. This option means that if some file has changes on ST server and that same file has been changed in the local working directory, it will get merged automatically and without prompting. Even though this situation would be not normal to happen, since no one should be supposed to go into Continuum working folder and modify any files, it is conceptually wrong to my opinion. As I said, Continuum should not be given the authority to merge files, since.conflicts may happen that may not be able to get automatically resolved. Please tell me if all this is wrong. Are you sure the first checkout uses "merge" param? The checkout implementation does not use that
I also agree that continuum should not have authority to do the merge, please file a new JIRA. Feel free to fix the code and test it out Thanks |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||