I'm trying to make a merge operation with Subversive in Eclipse.
I've been able to manage all the conflicts on the files structure, but it remains a conflict on the svn:mergeinfo property.
I've tried everything, but I'm not able to solve this conflict:
The plugin has a Mark as merged option, but it doesn't happen anything choosing that option.
I have also tried to remove the property, or to modify its own value, but nothing happens in any case, and the conflict is still present.
If I try an Override and commit, the status of the Folder of the project is Conflicting, also visible in the SVN Info on the properties of the project.
It seems that Subversive can't manage a conflict on this property: is that possible?
How can I solve this conflict?
Thanks in advance!
Even though I haven't found yet a solution directly with Subversive, I hacked the issue using a tool like SmartSVN.
With that tool I had been able to mark the conflict as solved, so I can say that it's a bug (or maybe a missing feature) of the current version of Subversive.
Related
I having issues with some custom modules not showing in the Task 'related to' dropdown field, therefore I cant add Tasks for these modules.
I've done the usual Repair/Rebuild, Rebuild Relationships and file checked permissions to no avail.
Does anyone have any ideas what might be causing these issues? I seem to vaguely remember back in the mists of SugarCRM being able to append to a variable to do a hacked fix for this.
Any help, much appreciated.
Fixed this by adding the module names into the following drop downs:
parent_type_display
record_type_display
Repair/Rebuild and it all worked fine. Still not sure why the modules weren't added originally.
I'm using JDeveloper version 11.1.1.7.0 for an ADF project. Whenever I edit a View Object that uses a resource bundle to provide labels via UI hints for things like input text fields and table column headers, the resource bundle reference at the end of the VO XML source gets automatically removed by JDeveloper. This means that every time I want to add a new attribute, change a binding, etc I must go to the History tab and restore the resource bundle reference before running my application. Otherwise, the labels are just displayed as the raw attribute names from the VO (e.g. "employeeName" instead of "Employee Name" from the resource bundle).
This is not just an issue for me, but for everyone on my team. At best, it's a constant annoyance. At worst, bugs get filed because labels are missing and inexperienced developers think they need to redefine every single label, which is a huge waste of time. I've searched on Oracle Support and can't find any patch for this. Google doesn't find anything useful. Does anyone else have this issue? Know what might be causing it and of a way to fix it?
ETA: Even if you've encountered this but don't have a solution, please post a comment stating this. Part of my question is whether this is an issue unique to the project I'm working on, or whether it's a common JDeveloper bug.
ETA: For the record, this is still a problem with version 12.1.3.
This has happened to us and this had caused regression issue in the past for us. We have had to redo the labels everytime we edit the view object. I guess this is a jdeveloper bug.
I don't even know how to describe this. I have a WPF project that I've added some libraries to. Libraries I've used in many other projects before. I have the strange issue of, when typing out code, intellisense can fill in things from a library fine, but as soon as I do a build, VS acts like all of these things are undeclared. Import statements suddenly say that I'm trying to reference things that don't exist, etc. But then if I clean the build, all of the references come back fine.
I'm completely stumped, any thoughts?
I have seen this if you are targeting the client profile, but some of the DLLs require the full .net framework.
This can happen if you are using file based references to libraries ($ref) that have corresponding projects in the same solution as the one you are adding references to ($proj).
Visual Studio is unable to (reliably) understand the build order and builds the items out of sequence (the $proj is built before the $ref, but after the $ref's output has been cleaned).
If you have this situation, just change the references to project based references.
Similarly, make sure there are no build events that would alter or move files.
Also, VS will sometimes search for a reference and pick a file at a location that you do not expect. Highlight the reference and check its property page, and make sure its actually where you think it is.
I have a Silverlight solution that has multiple silverlight projects (Views) that all compile to their own .Xap file.
There is one "master" project that handles the dynamic downloading of the Xap files, which works pretty well.
But now I need to make sure that all the references are set to CopyLocal=false in all the View Projects. Only the "master" project can have CopyLocal=true.
This means that the Xap files generated by the Views stay rather small.
What I would like to do is check post or during the build process to see if any of the View projects have a reference with CopyLocal=true.
What would be a smart way of doing this? Using an external tool in the Post Build event? Or perhaps an addin for Visual Studio ? Or creating a macro in Visual Studio for this?
I have looked at using .extmap with assembly caching, but since you have to specify the assemblies in that, this does not solve my problem. I just need to know if there is a reference with the wrong setting and report that. Fixing it is not the question, that will still be done manually. It's just the notification I need.
Solution has 35 projects now, so dont want to check them all by hand every time.
I found a question similar to this one, but it lists msbuild as a possible solution. I would like to know if there is a way to do this using "code" (be it prebuilt in a tool/addin or otherwise)
I have chosen to go the Addin path. I created an addin that listens to : BuildEvents.OnBuildBegin
Whenever that event fires I create a list of all projects in the current solution. Doing a bit of recursive searching since there are also Solution folders that make life in DTE world a bit harder.
Then I loop through all the projects and cast them to a VSProject so I can loop through all the references.
Anytime I come accross a reference that is wrong, I create an ErrorTask where I set the Document property to the full solution path of the reference. To do this I Build the path for the project this reference is in, all the way up to the root of the solution.
The ErrorTask is then sent to an ErrorListHelper class I created, that handles the ErrorTasks and also performs navigation.
If I'm done with all the projects and I found any errors, I cancel the current build and show the Error List window, where my ErrorListHelper holds all the Reference Errors I created.
Whenever I want to navigate to the Reference in question, I activate the Solution Explorer window and get the root of it using an UIHierarchy.
Then I walk the path from the root on down, step by step, using the UIHierarchy to get to the UIHierarchyItems and expand them. Until I get to the deepest level (the reference) and I Select that.
Since I only need it for a certain solution and within that solution for certain projects (.Views.* and .ViewModels.*) I also have some checking for those in place during buildup of the Error List.
It works like a charm, already found 12 "wrong" References in 35 projects where I tought all were well.
I am using a different path now to do this. I have a base class that I can use to write unit tests that have access to the DTE2 object. This way I dont need an addin. This also works for Silverlight projects since the test class does not actually need access to the Silverlight projects, just being in the solution is enough to be able to iterate through the projects and check the references.
Hi I'm using and Custom ServiceHostFactory, and when I want to update service reference it would'nt work because I assume it needs to setup my servicehostfactory and it will crash.
I have looked for other approaches to not use the generation, but I havent found any good replacements.
Are there anyway to go around this, to not remove the servicehostfactory from the svc files everytime and then put them back there after service reference updates :S.
We use the non generation method described in this dnrtv screencast.
It has worked very well for us. Prevoiously we wasted alot of time due to references not updating or developers forgetting to update a reference before they checked in code.
I rechecked the namespace path and it were wrong in the svc file.