Jump to content

Search the Community

Showing results for tags 'merge'.



More search options

  • Search By Tags

    Type tags separated by commas.
  • Search By Author

Content Type


Forums

  • Plastic SCM
    • General
    • Installation and configuration
    • Unity 3D
    • 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

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 49 results

  1. 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.
  2. 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
  3. 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
  4. 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.)
  5. ScottODDGames

    Plastic hangs when diffing large csv file

    In our project we have a large csv file that contains 572 rows with 13 columns for each row, currently sitting at about 7500 cells. This file is saved in UTF16 format as a tabbed separated document (despite the csv extension). I recently merged from a branch in which there were changes in both the source and the destination. Plastic automatically processed the conflicts, since then however I have been unable to diff the file in any subsequent changesets. The file itself only had three lines altered. I've reverted to a version since before the merge (as the automatic merge, while successful, seemed to corrupt the document). The file is now "fixed" after a revert but it is still unable to have a semantic diff performed on it. EDIT: I am using the latest version of Plastic (6.0.16.1614) on Windows 10 if that makes any difference. 2017-09-27 12-14-38.mp4
  6. When performing a merge, the display should show the result of the merge in before you actually check in the changes. However, the display is showing that the new change set created from the merge will be before the last change set on the branch into which you are merging. This is shown in the attached image. (NOTE: The pixelly nonsense where the branch name should be is NOT a part of the bug. The screen shot is from work where I have a NDA, so I blurred the text to be on the safe side.)
  7. redmond27

    Destructive automerge

    Twice since I started my project has changeset been unknowingly set to "0" while in the middle of working. Recently this caused me to lose all of my local changes. When I go to checkin, my changeset appears to be set to zero in my branch explorer, but no files on my computer support this. All files are up to date locally. When I go to checkin it only shows the local files to checkin that are different than my last changeset (22), not the changest 0 that is claims to be on. The first time this happened I merged to a new branch, then synced to the most recent change and then merged my branch in. The most recent time this happen I automerged (everything looked like it should work, I got no errors or requests for conflicts). This merge chose to overwrite ALL my local changes with the old changes and every line of code I wrote is now gone forever. I can't believe this happened and don't understand why an automerge would EVER overwrite local lines of code without warnings? How can I make sure this never happens again? Why is it setting my changeset to 0?
  8. One of our users has been working in a branch, and has a few changes checked in in various changesets that we want to do not want to bring into the main branch when we merge his branch in. In short. I want to merge most of his changes into the main branch, but some of them I do not want. I've tried all sorts of things, but Merge wants me to Merge everything. When I create a new changeset in the subject branch I can't seem to easily roll back any changes. What is the correct way to do this in Plastic?
  9. Has anyone tried to use Unity's YAML merge tool with older Unity projects? 4.72 specifically. I don't see it in the Unity folder in Unity 4.72, but I could direct it to the Unity 2017 folder.
  10. Hi, I have big project where on different branch I was making changes in directories (changing names, moving them) (I had to apply some local changes to be able to checkin) I was merging from main branch to my without any problems, but today I wanted to merge my branch to main and check if everything is right but I've got this error when tried to start merge: "Some Merge Operations Cannot Be Applied" I including screenshot, I don't giving me any other info, just 'can't be applied", I have to update plastic to newest version because now I have client 5.4.16.803 but don't know now chich version on server. Thanks in advance.
  11. mendozaa265

    Unity Smart Merge Integration

    Hi, has anybody had any luck getting unity smart merge to work? I've ran some tests to try to get a couple of simple scene changes merged properly but it doesn't seem to work. This is the error I get: my settings are defined as so in preferences->mergeTools: External Merge Tool: C:\Program Files\Unity\Editor\Data\Tools\UnityYAMLMerge.exe merge -p "@basefile" "@sourcefile" "@destinationfile" "@output" this is with it looking for the pattern .unity Is there something obvious that I'm missing? That command comes straight from the unity smart merge manual page so I'm not sure what's up. Thanks for the help!
  12. tony707

    Advanced cherry pick

    Hi, We were wondering if you eventually plan to add a feature allowing to cherry pick a changeset from any branch to any other branch ? We are already using the Advanced Merge > Merge from this changeset to, which is super convenient. The same feature for cherry picking would be nice too and would save a lot of time when maintaining multiple branches with the same hotfix. Thank you Anthony
  13. Hello! A couple of years ago you introduced a detailed merge history in diff view. Previously the diff view was only a plain list divided only into the Changed, Added, Deleted and Moved sections. After then the diff view started displaying files under extra sub-nodes which indicated consecutive merges a file underwent. Lets call this 'the detailed merge history'. I also remember that the detailed merge history had to be switched on at server side using command line, but I can't find the command for it. If I remember correctly, detailed merge history was available for all branches created after running the command. However, I don't remember any details concerning it. Probably the command had to be run on existing repos, but new ones were already prepared for the detailed view, I don't remember. Now the question :-). If you know what command I mean, could you please tell me whether this feature can be switched off in any way? I would just love a plain list of files in diff view :-). Thank you!
  14. Hello. Help! Thanks.
  15. Hi, Using GTK client 5.4.16.688 (linux) I see that kdiff3 works for merge operations. However when setting P4Merge as a custom tool the latter doesn't get displayed. I only get a list of files that can be modified manually using diff/merge rules listed in the context menu. I have validated that this command line works with test files : /opt/p4merge/bin/p4merge -nl "@sourcefile" -nb "@basesymbolic" -nr "@destinationfile" "@sourcefile" "@basefile" "@destinationfile" "@output" Would someone have an explanation ? P4Merge can be downloaded for free from : http://www.perforce.com/downloads/helix#product-10 Thanks Fred
  16. Hello, I'm trying to use the "before checkin" trigger to validate the checkin source is a merge and not direct checkin to the main branch. I'm trying to read the "PLASTIC_PENDING_MERGE_LINKS" (see reference : https://www.plasticscm.com/documentation/triggers/plastic-scm-version-control-triggers-guide.shtml#Checkin) My problem is that the env. variable "PLASTIC_PENDING_MERGE_LINKS" returns empty value when the trigger is fired. I've noticed that when I do merge operation, new files are created in my workspace : (1) plastic.merges, (2) plastic.mergeschanges. The problem is that I use server trigger, while these files are on the client side. BTY, I'm using version 4.1.10.465 Q: 1) Can you help me figure out how to read the pending merge link information? 2) Is there an option to read client workspace information from the server side? 3) Is there a better solution in newer PlasticSCM releases? Thanks, Ofir.
  17. Hi! I'm having a very strange problem. A co-worker performed a merge operation on the "git side of the force" and on his merge he's not doing any delete: After I performed my gitsync, Plastic is identifying a delete operation: These operations never happened. What do I do? I can't "undo" the delete operation on a merge. I don't want to "undo" all his work. Please, help! Thanks!
  18. Steps to reproduce the issue: Add an xlink on a sub branch, Add an identical xlink on the /main branch of the same repo (choose the same changeset of the destination repo). This is to cause an evil twin conflict when the branch is later merged. Now add another xlink (to a different repo) on the same sub branch, and then add an xlink to the same repo on the /main branch (but choose a different changeset of the destination repo). This is to cause an xlink conflict during merge. After you perform those four steps, try to merge the sub branch into /main. You should get an evil twin conflict and an xlink conflict (please see the "Conflicts before.png" picture). Then: Select all the conflicts on the list and click "Choose resolution method..." in their context menu. From the window that appears then choose the "Keep the item added on destination (discarding the add on source)" and select the "Apply the action for the next X conflicts" check box (please see the "Resolution.png" picture). Click OK. This will cause all xlink conflicts to double on the list (see the "Conflicts after.png" picture). However, if you do the same without including the evil twin conflict in the selection, the issue does not occur.
  19. Hello all, I would like to perform a partial merging operation from a branch A to a branch B. By partial, I mean from a changeset source (located on branch A), select only files that I want to merge to the destination branch (. Is it possible ? I tried cherry pick command but it seems not to be the right feature to use. Thanks, hlx
  20. Hey everyone, I would like to knbow if this is possible to ignore some file when merging from another branch. Let me explain. I have two branch A and B. I have a folder named X in both branches and a folder named Y in the branch B. I am on the branch B and I make some modification inside both folders, X and Y, and I commit, always on branch B. Now I go back on branch A and I want to merge from branch B but I only want to retrieve the modifications made inside folders X not Y. How can I do that ? Is it possible ? Tell me if this is not clear enough. Thanks a lot !
  21. I'm experiencing an error when attempting to check my changes in after a merge. It is quite difficult for me to describe the scenario, but let me try to give you at least some general information. In PlasticSCM client the following error message is displayed (see the attached picture). On the other hand, the server logs the following error at the same time: I experienced this error several times on different repositories. In all cases I was performing a checkin after merging a branch of a repository to its main branch. The checkin included both the current repository, and several other ones that were xlinked to it. When I was performing the checkin, it was interrupted several times by additional merge operations (a merge window appeared after I attempted to check my changes in). The consecutive merge windows referred to xlinked repositories and they usually informed about some move operations (a folder rename, eg. CAPIFax --> Fax as the log says). I always resolved the conflicts by preserving the destination branch changes (keeping the new name). After finishing all extra merges and attempting to check completely merged changes in, the above mentioned error would always appear. Details: The repository I was performing the checkin on (after a merge) had several writable xlinks to other repositories. I made some changes in those xlinked repositories in the branch I was merging from (e.g. added some files), Other people made changes in the same repositories I had xlinked (e.g. they renamed some folders in them). Sorry for a chaotic description, but it is quite difficult for me to explain all details of the scenario. Do you need some more information?
  22. Seeing this problem only on Windows using Plastic 5. This typically happens for Unity3d meta files. It occurs fairly regularly (several times per week) and is a significant roadblock to using Plastic with Unity. http://imgur.com/2yvG9Au The files in question are not read only, can be freely deleted in Windows explorer with or without Unity running. This problem persists even after a reboot. Currently we have to back up any files we want to save, discard all changes, then put our files back and try to commit again since you can't partial undo if there is a merge link involved.
  23. We updated PlasticSCM from version 4 to 5.0.44.509 on Friday. Today we were unable to merge changes from a sub-branch to the main branch in one of our repos. Plastic SCM client displayed a message telling about an SQL exception suggesting an attempt to insert a duplicate key to a table named 'revisionmerge'. Please see the details below. It is an excerpt from the plastic.server.log file (server-side). We tried to merge changes from two independent sub-branches of that repo and we were unable to do that in both cases (the same kind of error). Then we tried the same in another repo, and the issue did not take place there, so it must have been a repository-related problem not affecting other repositories. Eventually we restarted PlasticSCM server and the next attempt to merge sub-branch changes in the repository of interest succeeded. However, we are quite anxious and wonder why the problem took place, and if we can be sure it will not happen again. I have to mention that some time before PlasticSCM server was eventually restarted, I ran the builditemmergeinfo tool for several repositories, including the one of interest, as suggested in the release notes of PlasticSCM 5.0.44.505. The tool did not report any errors. Do you think that running this tool could be the reason of the issue? Can we be sure that the repository databases are in a consistent state? Why was there no such issue on the second tested repository if the tool was run for it as well? Thank you for your assistance in advance. -- 2013-12-02 15:37:35,427 012be65f-af40-4d3a-a994-89d77c230e5c NT AUTHORITY\SYSTEM at WINDOWS-7-GD ERROR CmCommand - Error ExecuteNonQuery. SQL [iNSERT INTO revisionmerge (iobjid, fidsourcerevision, fiddestinationrevision, itype, fiddestinationchangeset, fidlinkrealization) VALUES (@objid, @srcRevId, @dstRevId, @stype, @dstCsetId, @linkIdId) ] 2013-12-02 15:37:35,427 012be65f-af40-4d3a-a994-89d77c230e5c NT AUTHORITY\SYSTEM at WINDOWS-7-GD ERROR CmCommand - @objid = [4972] 2013-12-02 15:37:35,427 012be65f-af40-4d3a-a994-89d77c230e5c NT AUTHORITY\SYSTEM at WINDOWS-7-GD ERROR CmCommand - @srcRevId = [4750] 2013-12-02 15:37:35,427 012be65f-af40-4d3a-a994-89d77c230e5c NT AUTHORITY\SYSTEM at WINDOWS-7-GD ERROR CmCommand - @dstRevId = [4750] 2013-12-02 15:37:35,427 012be65f-af40-4d3a-a994-89d77c230e5c NT AUTHORITY\SYSTEM at WINDOWS-7-GD ERROR CmCommand - @stype = [2] 2013-12-02 15:37:35,427 012be65f-af40-4d3a-a994-89d77c230e5c NT AUTHORITY\SYSTEM at WINDOWS-7-GD ERROR CmCommand - @dstCsetId = [176] 2013-12-02 15:37:35,442 012be65f-af40-4d3a-a994-89d77c230e5c NT AUTHORITY\SYSTEM at WINDOWS-7-GD ERROR CmCommand - @linkIdId = [4971] 2013-12-02 15:37:35,489 012be65f-af40-4d3a-a994-89d77c230e5c NT AUTHORITY\SYSTEM at WINDOWS-7-GD ERROR CmCommand - Exception: Violation of PRIMARY KEY constraint 'PK_revisionmerge'. Cannot insert duplicate key in object 'dbo.revisionmerge'. The duplicate key value is (4972). The statement has been terminated. at System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection) at System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj) at System.Data.SqlClient.TdsParser.Run(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj) at System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString) at System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async) at System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, DbAsyncResult result) at System.Data.SqlClient.SqlCommand.InternalExecuteNonQuery(DbAsyncResult result, String methodName, Boolean sendToPipe) at System.Data.SqlClient.SqlCommand.ExecuteNonQuery() at Codice.CM.Data.CmCommand.ExecuteNonQuery() 2013-12-02 15:37:35,489 012be65f-af40-4d3a-a994-89d77c230e5c NT AUTHORITY\SYSTEM at WINDOWS-7-GD ERROR Operations - Plastic server version: 5.0.44.509 2013-12-02 15:37:35,489 012be65f-af40-4d3a-a994-89d77c230e5c NT AUTHORITY\SYSTEM at WINDOWS-7-GD ERROR Operations - OnError catching exception Violation of PRIMARY KEY constraint 'PK_revisionmerge'. Cannot insert duplicate key in object 'dbo.revisionmerge'. The duplicate key value is (4972). The statement has been terminated. 2013-12-02 15:37:35,520 NT AUTHORITY\SYSTEM at ERROR Codice.CM.Server.ExceptionTracerSink - Dumping in-transit exception:There has been an unexpected error "Violation of PRIMARY KEY constraint 'PK_revisionmerge'. Cannot insert duplicate key in object 'dbo.revisionmerge'. The duplicate key value is (4972). The statement has been terminated.". For more information check the server log.
  24. We have just upgraded our Plastic server installation to version 5 and now nobody can commit merges to the repository. We get the attached error in the server log. It is happening on the repository where we ran the builditemmergeinfo command, not on the ones we have not run that on. So possibly that has done something bad. The buildmergeiteminfo command ran without errors when it ran. We can do normal commits, just not merges. Any help to resolve this issue is much needed. plasticerror.txt
  25. Amimoller

    Cannot Complete merge

    Hi, We just upgraded to Plastic 5, im trying to do a merge and i get this error: Value does not fall within the expected range. (SS Attached) Its only for this particular merge, other merges completed successfully. Any idea? Is there a log file i can send? Cheers
×