[ http://jira.codehaus.org/browse/SCM-117?page=comments#action_83313 ] Giovanni Pedone commented on SCM-117: -------------------------------------
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. > Add parameters to scm configuration element > ------------------------------------------- > > Key: SCM-117 > URL: http://jira.codehaus.org/browse/SCM-117 > Project: Maven SCM > Issue Type: Wish > Components: maven-scm-provider-starteam > Affects Versions: 1.0-beta-2 > Reporter: Aviran Mordo > Assigned To: Dan Tran > > It would be very nice to have the ability to add parameters to the scm > element. For instance to add parameter to always force checkout. for instance > in Starteam I would like to add -o so every time stcmd is called the > parameters will be concatenated to the command line -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira
