Jump to content

Search the Community

Showing results for tags 'merge'.

  • Search By Tags

    Type tags separated by commas.
  • Search By Author

Content Type


Forums

  • Plastic SCM
    • General
    • Installation and configuration
    • Unity 3D
    • Unreal Engine
    • Plastic SCM on Mac
    • Plastic SCM on Linux
    • Gluon
    • Git interop
    • Integrations
    • Community Edition
    • Branching and merging
    • Announcements
  • Plastic SCM 4.0 Beta (Closed)
  • Plastic Cloud
    • General
    • Configuration
  • SemanticMerge
    • General
    • License
    • SCM's configuration
    • Share your experience!
    • External Parsers
  • GitJungle
  • Method History for Subversion
  • PlasticX Early Adopter Program's General Feedback
  • PlasticX Early Adopter Program's Issue Reporting
  • PlasticX Early Adopter Program's Feature Requests
  • PlasticX Early Adopter Program's Announcements

Find results in...

Find results that contain...


Date Created

  • Start

    End


Last Updated

  • Start

    End


Filter by number of...

Joined

  • Start

    End


Group


AIM


MSN


Website URL


ICQ


Yahoo


Jabber


Skype


Location


Interests

Found 15 results

  1. 2022-07-01 10:59:05,754 DESKTOP-SVKAU7O\Admin INFO PlasticPipe - CmCallContext CurrentTransaction changed and will be sent to server 7c372181-fd1c-4a41-bc84-708a2721e15f 2022-07-01 10:59:09,710 DESKTOP-SVKAU7O\Admin INFO PlasticPipe - CmCallContext CurrentTransaction changed and will be sent to server 00000000-0000-0000-0000-000000000000 2022-07-01 10:59:13,671 DESKTOP-SVKAU7O\Admin ERROR Performance - There has been an unexpected error "Index was outside the bounds of the array.". For more information check the server log. at PlasticPipe.PlasticProtocol.Client.ClientTransport.SendAndWait(PlasticServer plasticServer, PlasticMethods method, Credentials creds, INetworkMessage msg, INetworkMessage response, Boolean bRetryWriteMethod, FlexibleBufferPool lz4BufferPool, INegotiateActiveDirectory negotiateActiveDirectory, Int32 connTimeoutMsec, IResolveCloudServer resolveCloudServer) at PlasticPipe.PlasticProtocol.Client.ClientTransport.SendAndWaitWithRetry(PlasticServer server, PlasticMethods method, Credentials creds, INetworkMessage msg, INetworkMessage response, FlexibleBufferPool lz4BufferPool, INegotiateActiveDirectory negotiateActiveDirectory, Int32 connTimeoutMsec, IResolveCloudServer resolveCloudServer) at PlasticPipe.PlasticProtocol.Client.ClientTransport.InvokeMethod(PlasticServer server, PlasticMethods method, Credentials creds, INetworkMessage msg, INetworkMessage response) at Codice.Client.Common.Connection.PlasticProtocolCmProxy.PlasticProtocolMethodInvoker.DoInvokeMethod(PlasticServer server, Credentials creds, Exception& ex) at Codice.Client.BaseCommands.CheckIn.CheckinOperation.ConfirmCheckin(CheckinData ciData) at Codice.Client.BaseCommands.CheckIn.CheckinOperation.ConfirmCheckinStep(CheckinData ciData) at Codice.Client.BaseCommands.CheckIn.CheckinGenericOperation.ExecuteTreeConfirmCheckinStep(CheckinData ciData) at Codice.Client.BaseCommands.CheckIn.CheckinOperation.CheckinTree(CheckinData ciData) 2022-07-01 10:59:13,672 DESKTOP-SVKAU7O\Admin INFO Performance - Checkin - TOTAL: 12766ms 2022-07-01 10:59:13,673 DESKTOP-SVKAU7O\Admin ERROR PlasticThread - Error when performing background operation: There has been an unexpected error "Index was outside the bounds of the array.". For more information check the server log. 2022-07-01 11:01:10,487 DESKTOP-SVKAU7O\Admin ERROR plastic - Plastic SCM client version: 11.0.16.7080 2022-07-01 11:01:10,487 DESKTOP-SVKAU7O\Admin ERROR plastic - Error message: There has been an unexpected error "Index was outside the bounds of the array.". For more information check the server log. 2022-07-01 11:01:10,510 DESKTOP-SVKAU7O\Admin INFO TimerPerformance - RefreshAfterCheckin time 16 2022-07-01 11:01:10,513 DESKTOP-SVKAU7O\Admin INFO TimerPerformance - LoadWorkspaceTree time 0. 2022-07-01 11:01:10,547 DESKTOP-SVKAU7O\Admin INFO TimerPerformance - LoadWorkspaceTree time 0. 2022-07-01 11:01:10,679 DESKTOP-SVKAU7O\Admin INFO TimerPerformance - LoadChildren time 125 for 300 objects 2022-07-01 11:01:10,822 DESKTOP-SVKAU7O\Admin INFO Serialization - ChangesetExtendedInfoArray [321] deserialized in 31 ms. 2022-07-01 11:01:10,962 DESKTOP-SVKAU7O\Admin INFO Serialization - ChangesetExtendedInfoArray [1] deserialized in 0 ms. 2022-07-01 11:01:56,397 DESKTOP-SVKAU7O\Admin INFO PendingChanges - Enabling fast path comparer. 2022-07-01 11:01:56,431 DESKTOP-SVKAU7O\Admin INFO PendingChanges - Sorting time 32 ms 2022-07-01 11:02:18,408 DESKTOP-SVKAU7O\Admin ERROR MainForm - An error occured disposing the leap motion controller: Could not load file or assembly 'LeapCSharp.NET4.0, Version=0.0.0.0, Culture=neutral, PublicKeyToken=6e1b1368e71eba9b' or one of its dependencies. The system cannot find the file specified. I'm just trying to push 2k files at same location
  2. Hi Up until 2 days ago merging worked fine-ish, both with scenes (.unity) and assets. Yesterday, scene merging was unavailable due to "merge tools not being correctly configured in client.conf". After some troubleshooting, it appeared the path to UnityYAMLMerge.exe had changed (who knows why, I have not changed anything nor noticed any update). After setting it correctly, I was able to merge the scene but manually (and this had been automatic until then, moreover the changes were not conflictual, and a really small part of the whole file). Since manual merging of scenes is impossible to make sense of, I just accepted changes from both source and destination. It was a bad idea since it duplicated every object in the scene (I guess) and the scene was just empty in the editor, which didn't display anything else than "duplicate ID" error logs. So I reverted the scene back to a point where it was functional in the plastic GUI, but despite this being successful the duplications errors and the empty scene stayed. I thought that maybe the revert merged the ancient scene with the new buggy one, changing every asset but not deleting its twin. So I deleted the scene and recreated one with the same name, only for plastic to tell me that the scene ID was duplicated and it will not let me revert. What do I do now? Do I wait for a coworker to push his own scene (and maybe face the same problem)? Is there a way to reload the scene in its state before the buggy changes (besides the following)? I tried to download the scene and put an old version back in the project. Yet I get "Error loading the file 'Assets/Scenes/buggy_scene.unity'. File has multiple objects with same identifiers. Probably caused by a merge." and a host of "Duplicate identifier 13358067. File: "Assets/Scenes/buggy_scene.unity"." whith the id changing. The scene still appears empty in the editor. Any help would be greatly appreciated.
  3. We have one serious issue here. I just find out that if somebody add a new file in one branch, cherry pick that changeset to a child branch and after some time he/she wants to merge from the second branch to the first one, the file cannot be merged! I knew already about an evil twin conflict and the inability of Plastic to solve this type of conflict by a merge. I thought that a workaround to this is to make sure to check-in a file in one branch only and cherry pick it to other branches if needed. Now, I see it is not always a solution. In the described case the problem is even hidden, because Plastic offers an option to View content of the item loaded twice only (which looks like there is only one version of the file, so no merge is actually needed) but this is possibly not the sole version of that file. There might be a different revision in the other branch. What user typically wants is to merge those two revisions, but he/she can't! I don't understand why. May you bring some light into this area? (My primary system is still Plastic 4.1, I haven't tried this in Plastic 5 yet.)
  4. Hi guys, I am new to use plastic. I create a child branch from main branch and work on it without changing other's work. After I did some revision on the child branch, I want to get the latest revision of the main branch, so I want to merge from main branch to my child branch. Just as official tutorial shows, I: 1. switch workspace to my child branch 2. right click main branch and choose "merge from this branch" 3. in the merge from this branch view, click process all merges Then, an error windows popup, suggesting ❌ You don't have permissions to read the whole content inside the path '/' in the cs:xxx(my child branch's latest cs). The current operations needs to read the whole tree in order to continue. Please, review your path permissions and try again. (Sorry, for some reasons I cannot post any screenshot) I check the path permission of both main and my branch. I am under ALL USERS group, and all the permissions are allowed in this group. So how do I solve this problem? 😖 Anyone have some suggestion?
  5. Some of us can generate large amounts of data changes in a day. When the changes should be checked in it takes so long to upload them that someone else is likely to have made a checkin and the upload is dropped. This results in a manual merge step, even if no conflict exists, and then the whole thing repeats since the data has to be uploaded again. This isn't working well. I see a couple of potential solutions from the client's perspective. Upload will complete regardless of other checkins but it will stay in a temporary head until merged with the checkin branch. Checkin will succeed if there's no manual merging needed. This only helps a bit but is perhaps easier to solve. A workaround (that we wouldn't prefer) could be to submit in a branch since that will always succeed and merge. However, then we get the problem that we can't lock files across branches so we will get merge problems with our binary files instead. I'm not sure how to attack this problem with Plastic now. Is there something existing today that will solve this situation or will there be something in upcoming releases that will solve it?
  6. So i'm started use plastic afew months, I never get any problem, but since yesterday I can't make chekin in my changes, when I try, I recieve an error message who started apear suddently. Also, I'm the owner of organization and repository, how I can't have permission? what's going on?
  7. Is there a way to ignore a ignore specific line in specific file? Otherwise is a way to say whichever version of the file is fine for merging? In our Unity project we set the project version to match what cs we are working on, which gives a lot of merge conflicts... If there is no built in feature to deal with a known recurring conflict, is there any good workaround? We are thinking of setting up a pre-merge trigger that sets the value to 1 or something like that, but would much rather use a existing feature instead.
  8. When im trying to commit im getting an error that doesnt allow me to do so, its possibly due to the fact i had an ongoing pending cherry pick from a branch which i deleted, but i cant find the cherry pick window or anything to fix this. Thanks for your time in advance.
  9. I merged from main branch to task branch, did multiple changes and then tried to merge back to main branch. However if I try to Checkin, I get following error: "Cannot perform the checkin operation. All merge changes must be checked in together to ensure that the merge traceability is correctly stored. Please repeat the operation including all merge changes." If I try to Undo changes, I get following error: "Cannot perform the undo operation. All merge changes must be undone together. Please repeat the operation including all or none of its changes." Currently, I am unable to checkin, undo or even switch branch. All files affected by the merge process are selected to be merged. No files have pending changes. What have I done incorrectly or what should I do to be able to checkin the merge, or revert and do things correctly? Thanks
  10. If some reverts a file it only shows the CL number in bold that it's been reverted to in the file history. This is confusing and it should dhow the CL number as the operation does have a CL which you can see in the branch view. This makes it difficult to look through the history and see someone has done a reversion. It is also not entirely obvious that the reversion is going to stick when merged in from another branch. The same can be said for a subtractive merge. We have just had a case where so changes were being reverted when merging from main and we couldn't understand why. It turns out that someone had done an accidental subtractive merge in another branch and subbed it to main. When looking in the file in questions history that operation wasn't visible so it was really hard to track. Please can subtractive merges and revertions be listed with a CL number just like any other operation to make tracking down this sort of thing easier. Thanks, Stephen.
  11. Hi everyone! I have been using plastic for 2 weeks without any problem. But, the last time I tried to verify some changes in a project, an error message appeared and the operation was canceled. I have tried all kinds of things, but I have no results. Any help will be appreciated! Greetings, Juan.
  12. Hi there. I've seen quite a few reports of this similar message on the forum: "Checkin operation cannot be started because there is a merge in progress. Finish it before checkin the changes. In progress merge. Merge from cset xxx." But I still don't know what to do about it, and my colleagues bang their heads into the same problem. We can't check in but who knows how to do this merge? Sometimes while we can't do it in Visual Studio it works in the client app, but sometimes that doesn't work either. The only cast-iron solution seems to be to undo everything losing all changes, then update workspace and try again. There's a real logical problem to this since there doesn't seem to be any option to merge these changes. It seems in v3 the merge happened immediately but now it's being deferred and then breaking the checkin. Is there some real foolproof guide to how this should be working now? I can't even work out what it is that's going on, what the problem is, how to guarantee to solve it. Our designer to use Plastic too and he really doesn't know what he's doing, but at least v3 seemed logical and simple. None of us know what to do to solve this problem in v4. I've attached a screenshot. This is from our designer. He's not even aware of any merge. He just tried to make a small change to the existing workspace, but presumably his workspace was out of date when he came to check in. (It's difficult to persuade him to start a new branch to make one tiny change, and to be honest that seems like overkill to me too, otherwise we're going to end up with hundreds of branches filling up the branch list and getting in the way. Until there's a way to archive completed branches it's not something I want to do anyway.) The question is, how do you "finish" a merge? There doesn't seem to be any button or option to do that. Thanks.
  13. We're evaluating Plastic using the regular client (not gluon) and there's one aspect about it that seems to work against our normal workflow (as opposed to Perforce which we're used to). At any one time I'll have 10 files checked out. I will undo about 5, check in 2, and keep the other 3 untouched. The ones I want untouched, I might have checked out for weeks (or months) through multiple checkins, and eventually check in or sometimes undo. In Plastic this workflow is problematic. I can't just check in the 2/10 files and merge them into the main branch on their own. It either wants me to put them on a separate branch and then merge to the main branch, or do a messy merge with main where it tries to merge all my pending changes - not just the 2 I want to check in. I know it probably works this way in Gluon (haven't tried it), but I want to know if there's a way to do it in the regular client. I don't think source control should dictate our company's workflow, so I hope there's something I'm missing.
  14. Hi, we are looking for a way to list all changesets of a certain branch that have not been integrated into another branch. Our szenario is a beta deployment branch. There are a lot of changes directly made on that branch that are meant to be integrated into /main again. Other changes should not be integrated (workarounds etc.). We created a branch from /main that is used for this integration. The changes that have to be integrated are cherry picked from the beta deployment branch. We want to have a list of all changesets that are not merged in any way (merge or cp) from the beta deployment into the integration branch. I looked into the cm find examples on your homepage. I can detect branches that are not completely merged in terms of having changesets after the last regular merge. This does not fit in our scenario. Best regards Jan
  15. I have a question about merge and conflict with XLink. I would like to explain why after merge conflict exists. The problem/description: I have two repositories “TestPB” and “TestPB1”. The “TestPB” repository has XLink for the “TestPB1”. I have two branches to which the same change is added. Next updates the XLinki in the “TestPB” repository and merges like this: In this case, after the merge there is a conflict for XLink. I would expect that there will be no conflict because start and end changeset are the same, additionally the change (cs:23) was add in two branches - “TestPB1" repository. I am asking for help in explaining the merger or how to solve the problem for automatically merge
×
×
  • Create New...