![]() ![]() then this would be a Simple Custom structure to IMPORT. If you can import-export with other revision control systems ( and their structures) such as Git, etc. I am guessing some of the brilliant people at Plastic SCM might have already tried something like this. 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. 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'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. ![]() DOCX) from over the years in a Named Format - YYYY-MM-DD - ABC Name - XYZ Variation. I'd recommend Plastic SCM in a heart beat to any/ every development team(s) I come across, especially our clients. I've been playing with Plastic SCM and playing with it to manage versions of Word Documents for Sales/ Proposals etc. If you do decide to try to reproduce this problem with a smaller project some day in the future, we'd really appreciate it if you could send us a bug report so that we could take a look at what's happening.Manu - Thank you so much. ![]() I also would encounter merge conflicts when editing the same counter value in my for loop, so I'm really curious to know how you ran into this. Using Apple File Merge or SourceGear DiffMerge I was able to compare the changes between each version without any of the earlier changes being skipped. We don't have any specific timeline for these changes yet but we'll be sure to update our users when we have more information.įor what it's worth, I tried to reproduce your second issue with both 2017.1.1f.2.0f3 but wasn't able to run into it. We are aware of this limitation and plan to make improvements down the line. To your first concern, you're right that our current design doesn't make it easy for you to view specific changes (outside of what files have been modified) before you pull them. Person's 1 change is just gone and no conflict was ever raised.Ĭlick to expand.I understand. Its almost as if it only wanted to compare with the original change only and not future changesĢa) Both people edited a for loop in the same file (this is immediatly after that first test scenario)Ģb) Person 1 changed the for loop to be from i=0 to i=1Ģc) Person 2 changed the for loop to be from i=0 to i=4Īt this point there was no conflict and the value in the file was i=4 These changes are going to be called A (person 1) and B (person 2)ġc) Person 2 saw the publish and did an update creating a conflictġd) Person 2 resolved the conflict and put a new comment into the code to show it was resolvedġe) Person 1 made another change in the same placeġf) Person 2 (who has not done any publishing at this point) sees this new change and does an updateġg) Person 2 sees a conflict but instead of the conflict being between his resolution of the first conflict, and the new change, its between the original B change and the new change. 2 more things I found while evaluating conflicts between 2 peopleġa) Both people touched a function in some file.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |