crashnburn Posted January 29, 2013 Report Share Posted January 29, 2013 I am referring to this article/ blog post and quoting a part of it. http://codicesoftware.blogspot.com/2012/08/diff-and-merge-for-microsoft-office_6.html Select the document that you want to compare (make sure it's been added to source control) and select Plastic SCM Diff Tool on the context menu (alternative just run "diff with previous"). Is it only possible to do a Diff between a "previous and current version" of Office Documents? I'd like to do a Diff between specific REVISIONS / CHANGESETS / BRANCHES of the Office Document. Is that possible? How? I've tried to figure out how to do it and have failed miserably / feel very lost. EDIT: Clarified. Link to comment Share on other sites More sharing options...
manu Posted January 30, 2013 Report Share Posted January 30, 2013 Hi! Indeed you are able to select a specific revision. First option: Right click in the item -> Diff... -> Diff revisions... Second option: Open the file history, then select the two revisions you are in -> right click -> "Diff selected revisions" Link to comment Share on other sites More sharing options...
crashnburn Posted January 31, 2013 Author Report Share Posted January 31, 2013 Let's say I have a Single Word Document in the following structure with VARIATIONS under each Branch as outlined below: With a Main trunk MAIN 1 And Child Branches A, B, C and each having Sub-Children A1, A2, A3, B1.. . C3 How is it possible to DIFF and MERGE from One ChangeSet/ Label (ORIGINAL-O1) to Another (REVISED - R1) - I am guessing this is from Inside the Branch Explorer?? (also the branch explorer inside Plastic SCM windows shows a certain branching and 2D branching shown by Right Click > Word File) Would this be a Visible and Visual (in Word) merge? or not? O1 + R1 > Data > MERGE 1 ?? or O1 + R1 > R1+ ?? or O1 + R1 > O1+ >> Which of the above thoughts would be true for the Word Document? AND.. How do I make this happen? ... I get confused in terms of SOURCE/ DESTINATION during Merges? Is it possible to MERGE between A / B / C - Branches and Sub Branches. Or will the MERGE Link to comment Share on other sites More sharing options...
manu Posted January 31, 2013 Report Share Posted January 31, 2013 Hi! I think all your merge cases are supported, and the merge operations are carried by MS Word. Regarding the diffs, you are able to diff the revisions using the history view and the "Diff with other revision..." feature, but not for example by double clicking a changeset -> we should improve that. While you are running a merge you can click in the "Explain merge" button you will see which changeset is the SOURCE, which one is the BASE and finally which one is the DESTINATION. If you have any question don't hesitate to ask, we can also schedule an online meeting to explain how it works. Link to comment Share on other sites More sharing options...
crashnburn Posted February 1, 2013 Author Report Share Posted February 1, 2013 Let's take the instructions for outlined here in User Manual Section: 3.3.3 Integrating the Changes from a Task Branch – Merging I have a similar situation for the Word Document - How would the Merge Proceed? Would I be able to Merge changes from Task Branch to Main Branch of the Word Document? If I follow the instructions in 3.3.3. Would Plastic SCM - Would it be a silent merge (no user interaction?)? - Would it start up Microsoft Word? OR - Would it be a Visual Merge where I "have to" or "get to" choose inside MS Word what parts and how to merge? => If this is the case - Is there a video walk through for this because I am not exactly sure how to go about doing this without corrupting the existing SnapShots (Main and Task) that I currently have. Link to comment Share on other sites More sharing options...
manu Posted February 1, 2013 Report Share Posted February 1, 2013 Hi! If the MS Word document is changes ONLY in the task branch (SOURCE) the merge will be automatic, no user interaction, no MS Word running. If the MS Word document is changed in both main branch (DESTINATION) and task branch (SOURCE) the merge will be manual. MS Word will be started and you will be able to accomplish the merge. Link to comment Share on other sites More sharing options...
crashnburn Posted March 6, 2013 Author Report Share Posted March 6, 2013 manu - Thank you so much. I've been playing with Plastic SCM and playing with it to manage versions of Word Documents for Sales/ Proposals etc. I'd recommend Plastic SCM in a heart beat to any/ every development team(s) I come across, especially our clients. One question - I have a tons of these documents (.DOC/ .DOCX) from over the years in a Named Format - YYYY-MM-DD - ABC Name - XYZ Variation. I'd like to do a historical import of them into Plastic SCM such that they are LINKED in the lovely GRAPHIC/ VISUAL path rendition in Branch Explorer. Now, I know this may not be standard - But I believe you have a "data structure" via which you TimeStamp versions & variations and keep inside Plastic SCM. I dont mind writing some code/ script against Plastic SCM API to IMPORT these "versions" and "variations" into the RECORDS / SYSTEM managed by Plastic SCM. I am guessing some of the brilliant people at Plastic SCM might have already tried something like this. If you can import-export with other revision control systems ( and their structures) such as Git, etc. then this would be a Simple Custom structure to IMPORT. PS: Should I create a separate thread for this..? It might be an interesting subject of discussion to import historical archive material and have it show up connected in Branch Explorer. Thoughts? Can you get Amalia (from here) to also look at this post/ question. Link to comment Share on other sites More sharing options...
manu Posted March 7, 2013 Report Share Posted March 7, 2013 I'd recommend Plastic SCM in a heart beat to any/ every development team(s) I come across, especially our clients. Niiiiiiiiice, thank you very much! One question - I have a tons of these documents (.DOC/ .DOCX) from over the years in a Named Format - YYYY-MM-DD - ABC Name - XYZ Variation. I'd like to do a historical import of them into Plastic SCM such that they are LINKED in the lovely GRAPHIC/ VISUAL path rendition in Branch Explorer. Now, I know this may not be standard - But I believe you have a "data structure" via which you TimeStamp versions & variations and keep inside Plastic SCM. I dont mind writing some code/ script against Plastic SCM API to IMPORT these "versions" and "variations" into the RECORDS / SYSTEM managed by Plastic SCM. I am guessing some of the brilliant people at Plastic SCM might have already tried something like this. If you can import-export with other revision control systems ( and their structures) such as Git, etc. then this would be a Simple Custom structure to IMPORT. PS: Should I create a separate thread for this..? It might be an interesting subject of discussion to import historical archive material and have it show up connected in Branch Explorer. Thoughts? Can you get Amalia (from here) to also look at this post/ question. Yes please create a new topic, I have some ideas to hack Plastic in order to achieve what you want. It will require some scripting or programming. Best regards! Link to comment Share on other sites More sharing options...
crashnburn Posted March 20, 2013 Author Report Share Posted March 20, 2013 Niiiiiiiiice, thank you very much! Yes please create a new topic, I have some ideas to hack Plastic in order to achieve what you want. It will require some scripting or programming. Best regards! I just posted the question as a fresh topic thread here BTW - Thank you so much for the help Link to comment Share on other sites More sharing options...
calbzam Posted March 21, 2013 Report Share Posted March 21, 2013 Ok, let´s better switch to a different post Link to comment Share on other sites More sharing options...
Recommended Posts
Archived
This topic is now archived and is closed to further replies.