Hi, I have a maven project which uses the shade plugin to create a jar from several projects. In addition it is possible with this plugin to create a source jar from these several projects. For legacy reason we need to have one jar which contains classes and sources, so the combination of the two jars created by the shade plugin. Wha...
i ever use TortoiseSVN it can merge but it dont have client on MAC ...
I have a target table which has a lot of dependent tables. I am trying to modify the table data using the MERGE statement. Insert/Update is fine, but there is a problem while deleting. WHEN NOT MATCHED BY SOURCE THEN DELETE; Here the data needs to be deleted from the dependent tables as well. Is it possible to call a stored proce...
So, I got a big menu with a couple of sub-items under each menu-item. Each sub-item needs javascript-includes and in some (pretty often) cases there are 20~ includes. This obviously sucks considering the HTTP-request time blah blah. My thoughts are the following. I'm creating a merger-file (in PHP) that will handle all the js-includes a...
I have made a mergesort that is being juxtaposed with two already created selection and insertion sorts which both count the comparisons so that when executed the program illustrates which methods are faster. I can't figure out how to get a count implemented into my mergeset I really don't know if it's even working correctly or if I...
Hi. I need to delete many rows from sql server 2008 database, it must be scalable so i was thinking about bulk delete, the problem is that the are not many references on this, at least in my case. The first factor is that i will exactly know the ID of every row to delete, so any tips with TOP are not an option, also i will delete less ...
I'm working on a project where I have a commit that introduced a feature with major problems that weren't discovered immediately. Now I want to completely remove that revision while keeping the work following it but i'm having a hard time wrapping my head around this 3 way merge. Here is a simplified graph of my project. o changeset: ...
If i use ex.merge(obj), now if in object obj i set the primary key to a value which is not present in database, will it create a new record or will it throw an exception? for example if obj with pk val = 19 doesnot exist in database,and i set obj.setPk(20); obj.setName("nm"); em.merge(obj) // will this throw an exception or create a ...
I have been working in a branch for a couple months and am now trying to merge the trunk into the branch, before finally merging my branch into the trunk. After successfully merging a few revisions, SVN threw an error about the "bin" folder being locked. When I created my branch, the folder was called "Bin", but at this particular revi...
Situation: User want to import Youtube playlist in a JQuery site using Youtube's JSON API. Problem: Youtube only gives back first 50 entries, but playlists can be 100+ entries long (length is given by 'totalItems' in JSON response). All the entries need to be merged as 1 object and need to be pushed into an output function at the end. ...
Lets say for the sake of argument that we don't care much about history. If I have a master branch that is being updated somewhat often and I have a shared topic branch that is rather long lived, will regularly merging master-> topic branch (and resolving conflicts as they arise) allow for a smooth merge of the topic branch -> master la...
Hi all, I want to merge two images where one is a greeting card with a heart shaped portion transparent and another is the image of a couple. Now I want the image of couple movable so that i can move them and resize them to set in that heart part and then I want to save that mixture of image as one image and send it as attachment in mail...
SUMMARY: Why does external SVN conflict resolution show literal files comparisons and not recent change deltas? DETAIL While merging, SVN reports a conflict. That's fine. However while using launch to examine the conflict, I am shown not just the current conflict but historical conflicts which I have already dealt with. (The conflic...
I'm trying to count up ip addresses found in a log file on two servers and then merge the dictionary stats together without loosing elements or counts. I found a partial solution in another stack overflow question but as you can see it drops the '10.10.0.1':7 pair. >>> a = {'192.168.1.21':23,'127.0.0.1':5,'12.12.12.12':5,'55.55.55.55':1...
We had a CVS tree cvsrootv6 which uses Java 1.4 and Websphere 6.0. Now because we are upgrading our systems we copied the whole CVS tree i.e cvsrootv6 and make a new independent tree cvsrootv7 for Java1.6 and Websphere 7.0. While having cvsrootv6 tree in production we started resolving some versioning issues with cvsrootv7. At the same...
I have two branches, A and B. Branch A have a directory examples with some files that are tracked by git, and these files should not appear on branch B. In my workflow, I do merge changes made in A into B often, which is a problem every time that there is some changes on examples. For the moment I am doing this manually: erasing the file...
In jpa merge, are all coumns of updated or only the columns which has new values? While updating if i set value of some attribute to null, will null value will be stored in that cloumn in db, or will it retain previous value? ...
Hi. I'm using MERGE in my query and i'm making INSERT on clause WHEN NOT MATCHED THEN, but then i would like to get the inserted row identity and make another INSERT to some other table. Query for now is: ALTER PROCEDURE [dbo].[BulkMergeOffers] @data ImportDataType READONLY AS SET NOCOUNT ON; DECLARE @cid int = 0 MERGE dbo.oferta AS ta...
We use TortoiseSVN on Windows and VisualSVN server. I just completed the merge and reintegration of a feature branch back into trunk. The experience wasn't as smooth as I'd hoped and I have some questions based on my experience. 1) Merging trunk changes into branch. I went through and identified all of the repository revisions that a...
The situation is as follow : Our company works two main production sites, communicating via WAN. We develop a software internally which uses about 100Gb of disk space on our servers (application data deployed to our customers with a lot of images). In order in improve performance, our network administrators choosed DFS replication (ever...