I have two configurations:
ea-sparx
CVS - Architecture
Both point to the same working copy path. It seems that I have checked out an existing repository under one configuration (CVS - Architecture), but I have made changes and checked them in under the other configuration (ea-sparx).
Question: How can I move all my changes to the other configuration?
In the first place, Not sure how you changed the configuration of a controlled package. But if both are pointing to same working copy, Get All Latest should get you the latest. If you still have problems checking in / checking out, that could be due to due to out of synch, You can try "Resynch status with VC provider" for that package.
I don't know what models you have created, but UML models are saved as XML-files. Those XML-files contains tags looking like
<UML:TaggedValue tag="packageFlags" value="Recurse=0;VCCFG=CVS - Architecture;"/>
or
<UML:TaggedValue tag="packageFlags" value="Recurse=0;VCCFG=ea-sparx;"/>
A possible solution:
edit the XML-files manually: change ea-sparx to CVS - Architecture in your XML files
remove the ea-sparx configuration from Enterprise Architect
Get All Latest
Related
I moved a web application I am working on from one machine to another. It is built using .Net MVC and Entity Framework but when I execute the Update-Database command so that the database is updated, I get this error:
Could not find any resources appropriate for the specified culture or the neutral culture. Make sure "NameofMigration.resources" was correctly embedded or linked into assembly "NameofProject" at compile time, or that all the satellite assemblies required are loadable and fully signed.
Does anyone know how to fix this error?
I had a similar issue when the resx part of the migration was not included in the project file when a fellow developer checked the project in (probably due to a merge issue). You may find that the resx file is there but greyed out. If it's there, try right clicking the "NameofMigration.resx" file and selecting "include in project". If it's not there, you better go find it on the other machine and add it to the project :-)
I think the issue (one issue) is that the .resx file is added as "dependent upon" (nested under) the .cs file, and the way the build engine works, "dependent upon" changes the name that an embedded resource is saved with (something like, it changes from being based on the filename to being based on the type name; I've dealt with this in other scenarios but can't remember for sure).
This leads to problems when using SDK .csproj files, for some reason (I guess that by default SDK .csproj does not change the resource name in this situation, but the migrations system expects it to).
As someone else had posted, SDK .csproj can use the following tag to change the embedded resource naming scheme for "dependent upon" resources, which then allows the migrations system to find the embedded resource:
<EmbeddedResourceUseDependentUponConvention>
true
</EmbeddedResourceUseDependentUponConvention>
This should go in a <PropertyGroup> of your SDK .csproj file.
For VS 2017, the solution is as follows:
Go to the project file, and for all of the migrations, apply the following format:
<Compile Include="Migrations\201804251606403_emailsWithEffort.cs" />
<Compile Include="Migrations\201804251606403_emailsWithEffort.Designer.cs">
<DependentUpon>201804251606403_emailsWithEffort.cs</DependentUpon>
</Compile>
<EmbeddedResource Include="Migrations\201804251606403_emailsWithEffort.resx">
<DependentUpon>201804251606403_emailsWithEffort.cs</DependentUpon>
</EmbeddedResource>
I guess that the problem is when changing version(s) of Visual Studio, old format of describing dependencies stays, and the Visual Studio 2017 can not interpret it correctly.
Hence, applying the format as described above (change your format to this), you can make the Visual Studio get the idea of where it's resources are.
Slightly different situation, where I created a new environment, and database, and received the above error message.
For my fix, I had to right-click on the migration files (initial and resx) and set property to embedded as resource. Update-database command ran fine afterward.
I encountered the same issue (VS 2017) and none of the solutions provided here worked. I fixed the problem by cleaning the solution and manually deleting the bin folder and then building it again.
If anybody wants to look into the source or compiler to know why this is happening; I don't feel like it right now. After an hour of tinkering, my resolution is odd.
Granted, I shouldn't have done this in the first place, but for quick code I temporarily added classes into the same file as my generated DbMigration 201906212110305_initial.cs. The mere existence of those temporary classes in the same file caused this error. As soon as I moved them to their own file (which I was going to do all along anyway) the runtime error vanished.
Unloading and then reloading migration file worked for me!
I've installed the latest AjaxControlToolkit and everything's working fine and dandy.
When I go to check-in my changes none of the ACT stuff is ticked for check-in but any pages I have edited have been ticked.
Is there a specific reason for this? Should I not check it in?
Possibly some quirk of your source control provider.
Personally, I like to include everything (non-standard) required to build the solution in SVN.
For AjaxControlToolkit, I use Nuget.exe, packages.config containing a line relating to a specific version of AjaxControlToolkit, and a pre-build event to automate downloading the correct version of the toolkit just before the build.
This way, you get to tie a specific revision of your work in source control to a specific version of the toolkit, without having to check binaries in to source control (bad practice).
I get this error in realtion to my [username].mode1v3 package file:
Error: 155015 (A conflict in the
working copy obstructs the current
operation) Description: Commit failed
(details follow):
I can do a compare from the SCM results menu on this file. Doing so reveals 102 conflicts (differences) between my local copy and the latest version in the repository. Problem is I don't understand what this file relates to or how to fix it. Differences occur in the file under keys like
PBXSmartGroupTreeModuleColumnWidthsKey
which I have no idea about.
I am the only one working on this project. How is it possible to resolve a conflict such as this?
Many thanks.
Sounds like you're probably working on two computers?
Any conflicts that happen in that file can safely be ignored - just tell your SCM to accept your local version. It's one of the files Xcode uses to keep track of your project state within the IDE.
I'd recommend taking it out of source control and telling your SCM system to ignore it.
This file contains your personal Xcode settings (like window positions and so on). It should not be under version control at all.
I have a smallish utility library I made that I had created in TFS Beta 2 to test out TFS. I now have TFS rc1 installed(and Beta 2 uninstalled) and am trying to add my Solution to TFS.
I get an error saying that it is already bound to my old TFS, which was on a different system then this one. Strangely, when I go into Source Control and look at the bindings it says there aren't any. Also, I manually deleted the .vss and .vsc files and it still does it.
Ideas? I looked through the numerous other SO topics related to this but unless I missed one none of them are dealing with my issue.
Ideas?
Grab the TFS Sidekicks from Attrice. They have a workspace sidekick, you can pretty quickly find your old machine and unbind/delete that workspace from TFS.
Once you install:
VS Menu Bar
Tools
Team Foundation Sidekicks
Workspace Sidekick
Owner will defult to you, just clear machine name
Search
Select old workspace, click the red X to delete
I had old server entries too and I fixed it by using the workspace sidekick mentioned here and then using the command line to get the rest that the tool couldn't find.
After doing a fresh checkout using Subversive, some of the directories retrieved because of svn:external properties are showing up as obstructed. However not all of them are. A command-line use of "svn status" properly shows all the directories as externals with no obstructions.
Why is this happening?
This does looks like this thread
We checked the situation and we had found that the problem can happen in case if working copy is locked by external process in time of update.
For example, the process TSVNCache that related to TortoiseSVN time-to-time produces conflicts with working copy access and JavaSVN library cannot complete working copy modification in correct way. As result working copy goes into "Obstructed" state, i.e. it is damaged.
The same diagnosis related to any process which locks working copy in time of working copy meta-data modification. (We found same behavior for MS Visual Studio 2005 Express Edition, but I don't know why the Studio locks WC?)
So be sure to make the checkout with the least possible number of application running.
Another source of conflict could be:
The SVN 1.4.x-compatible clients are automatically converts working copy into 1.4.x-compatible format. At the current moment Subversive Default client is incompatible with SVN 1.4.x working copy format.
So, if you performed any modification of the working copy using command line SVN client in your case you will get "Obstructed" state indicated over the resources in the workspace tree.
In order to resolve the problem I will propose you to switch SVN client option and select SVN Kit 1.1.0-based client or Native JavaHL 1.4.2 client.
Next, if resources already decorated as "Obstructed", please close and then open again corresponding projects or simply restart Eclipse IDE in order to reload SVN meta-information cache.
Now : the exact version may not be the same for you, but that is another lead to check.