tom.peters Posted January 10, 2012 Report Share Posted January 10, 2012 Good Day! I am currently setting up our shop as fully-distributed and, as of yet, we do not have the firewall permissions setup to allow push/pull between machines. Therefore, I am using the replication packages. My question is: When importing a replication package to my /main branch, is the merge done automatically? I ask because I was surprised to see two revisions on my item after I finished. Here is what I did: Both servers are in sync Create child branch from /main on PC001. Branch is named RepTest001 On PC001, switched workspace to /main/RepTest001 Checked in a change Created a replication package from /main/RepTest001 Copied PKG to SRV001 In the branches view, I right-clicked /main and selected Import Replication Package I selected the PKG file and pointed to SRV001 and the appropriate repository Import seems to work, as /main/RepTest001 now exists in SRV001. I did a diff on the branch and saw my change. Therefore, I merged from /main/RepTest001 to /main My item shows two revisions: the first seems to be the import and is accredited to /main/RepTest001. The second is my merge. These two revisions are identical. So, basically, does an import of the PKG to /main both import the branch and merge it to /main? Thanks! Tom Link to comment Share on other sites More sharing options...
tom.peters Posted January 10, 2012 Author Report Share Posted January 10, 2012 To clarify: Step 7 onward is on SRV001 Link to comment Share on other sites More sharing options...
manu Posted January 11, 2012 Report Share Posted January 11, 2012 Hello Tom, you are using PlasticSCM 4.0 right? If the file merge operation remark is "Changes only in source contributor" a new revision is not needed due to the source file revision (The one in branch RepTest001) will replace the one in destination branch (Main branch). You can review the file history to check if truly there is a new revision in main branch (Right click on the file and View History), maybe you think there is a new revison of the file due to you see a new changeset as the result of the merge. So, basically, does an import of the PKG to /main both import the branch and merge it to /main? If you create a new replication package from main branch of SRV001 repository the merge link and the merge result changeset will be included inside the package so you don't have to re-merge again the RepTest001 branch Manu. Link to comment Share on other sites More sharing options...
tom.peters Posted January 11, 2012 Author Report Share Posted January 11, 2012 Hi Manu - Thanks for getting back. Actually, I am still on version 3.0.187.25. Does your answer still apply? Regards, Tom Link to comment Share on other sites More sharing options...
manu Posted January 11, 2012 Report Share Posted January 11, 2012 Hi Tom, what are you doing in 3.0?? Move on to 4.0!!! hehehehe Never mind, in PlasticSCM 3.0 a new file revision will be created in the main branch as the result of the merge, it will have the same content as the one in the RepTest001 branch... pointless... In 4.0 we replace the loaded revision in main branch with the one in the task branch without creating a useless revision... But the thing about the merge and replication is the same, you can create a package and the new changeset, revision and merge link will be included on it. Regards, Manu Link to comment Share on other sites More sharing options...
tom.peters Posted January 13, 2012 Author Report Share Posted January 13, 2012 Fantastic! BTW - I plan to get us onto 4.0, soon, but the upgrade process looks a bit sticky, so I gotta plan this all out. Link to comment Share on other sites More sharing options...
manu Posted January 13, 2012 Report Share Posted January 13, 2012 ...but the upgrade process looks a bit sticky.... Upgrade to 3.0.187.33 cm fast-export repo@localhost:8084 repo.fast-export Copy the repo.fast-export file to a machine with PlasticSCM 4.0.239.0 installed and from that machine using the cm.exe(v4.0): $ cm fast-import repo@localhost:8087 repo.fast-export Restart the PlasticSCM 4.0 server and start working! That's all! Link to comment Share on other sites More sharing options...
tom.peters Posted January 18, 2012 Author Report Share Posted January 18, 2012 SWEET! I will let you know how it goes! Link to comment Share on other sites More sharing options...
manu Posted January 18, 2012 Report Share Posted January 18, 2012 Cool! Ask us if you have any question! Link to comment Share on other sites More sharing options...
tom.peters Posted January 26, 2012 Author Report Share Posted January 26, 2012 Hi Manu - I upgraded to 3.0.187.35 and tried the fast export. I got the following error: C:\Plastic Upgrade>cm fast-export <myrep>@localhost:8084 <myrep>.fast-export 671 changesets retrieved 671 changesets will be exported You don't have permissions for operation advancedquery. C:\Plastic Upgrade> I looked in the forum and saw that granting 'advancedquery' to the Branches resolves this, but I do not see that permission, at all. Any advice? Link to comment Share on other sites More sharing options...
manu Posted January 26, 2012 Report Share Posted January 26, 2012 Hi tom! yes, you have to grant that permission to your user, just go to the repository server permissions (Right click on a repository) and select the "advancedquery" permission. http://screencast.com/t/f3fFJ8bJ Manu. Link to comment Share on other sites More sharing options...
tom.peters Posted January 26, 2012 Author Report Share Posted January 26, 2012 That did it! Fantastic! Thank you!!!! Link to comment Share on other sites More sharing options...
manu Posted January 30, 2012 Report Share Posted January 30, 2012 Cool! Link to comment Share on other sites More sharing options...
tom.peters Posted February 9, 2012 Author Report Share Posted February 9, 2012 OK. It seems that if I make my local server the 'source' and the remote/master server the 'target', all is well. It's when the remote is defined as 'source' that I get this error. Since I can work now, this can be closed. Thanks for your time!!!! Link to comment Share on other sites More sharing options...
tom.peters Posted February 9, 2012 Author Report Share Posted February 9, 2012 Wrong post. Sorry Link to comment Share on other sites More sharing options...
manu Posted February 21, 2012 Report Share Posted February 21, 2012 Hehehe don't worry! Link to comment Share on other sites More sharing options...
luisma Posted March 6, 2012 Report Share Posted March 6, 2012 Hola. Para este mismo caso (ya hice todo lo que está apuntado anteriormente), cuando estoy haciendo el "fast export" en un punto del proceso obtengo el siguiente error: Error: Index (zero based) must be greater than or equal to zero and less than the size of the argument list Originalmente intenté la exportación desde nuestro servidor de Plastic (v3.0.187.19) el cual tiene toda nuestra historia desde hace mucho tiempo y obtuve el error mencionado. Pensé que era algo relativo al tamaño del repositorio y decidí entonces hacer lo mismo en mi máquina local con un repositorio mucho más pequeño. Lamentablemente obtuve el mismo error al cabo de unos minutos. ¿Alguna idea? Gracias. Link to comment Share on other sites More sharing options...
luisma Posted March 6, 2012 Report Share Posted March 6, 2012 Hola. Para este mismo caso (ya hice todo lo que está apuntado anteriormente), cuando estoy haciendo el "fast export" en un punto del proceso obtengo el siguiente error: Error: Index (zero based) must be greater than or equal to zero and less than the size of the argument list Originalmente intenté la exportación desde nuestro servidor de Plastic (v3.0.187.19) el cual tiene toda nuestra historia desde hace mucho tiempo y obtuve el error mencionado. Pensé que era algo relativo al tamaño del repositorio y decidí entonces hacer lo mismo en mi máquina local con un repositorio mucho más pequeño. Lamentablemente obtuve el mismo error al cabo de unos minutos. ¿Alguna idea? Gracias. Olvidé mencionar que en mi máquina tengo la versión 3.0.187.30 Link to comment Share on other sites More sharing options...
manu Posted March 7, 2012 Report Share Posted March 7, 2012 Hola luisma, por favor utiliza la última versión 187.35 tiene varias mejoras en el fast-export y puede que tu incidencia este resuelta. Link to comment Share on other sites More sharing options...
luisma Posted March 7, 2012 Report Share Posted March 7, 2012 Hola luisma, por favor utiliza la última versión 187.35 tiene varias mejoras en el fast-export y puede que tu incidencia este resuelta. Listo! Eso arregló el problema. Mil gracias! Link to comment Share on other sites More sharing options...
manu Posted March 7, 2012 Report Share Posted March 7, 2012 Perfecto, pregúntanos lo que sea si tienes alguna duda. Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.