Background: I'm cleaning large (cannot be held in memory) tab-delimited files. As I clean the input file, I build up a list in memory; when it gets to 1,000,000 entries (about 1GB in memory) I sort it (using the default key below) and write the list to a file. This class is for putting the sorted files back together. It works on the f...
I have what I thought was a simple scenario - using TortoiseSVN: 1) I made a branch (B2) of an application (to work on implementing image sprites & JAWR). 2) Testing & development went on as normal on the trunk. 3) I re-based the branch a couple of times over the last few days by: 3.1) Merged trunk (by range of revisions) to my branc...
When i do a synchronisation of files or try to commit, there are also files shown that are not changed. This is only when i did a merge from an other workspace to the one i get those files in. When i take a look at those files, they have no difference from the files on svn. anyone any idea? ...
I am using a combination of Spring 2.5.6 and Hibernate Annotations. I have three objects(tables or w/e) under consideration: Customer, Address, Order. Customer has the Cascade DELETE_ORPHANS property set for addresses. What i am doing is a customer merge, i'm moving all addresses and orders from one customer to another, then setting a d...
I have 2 separate arrays, one is just the id's the other is the percentage Id's: Array ( [0] => 3 [1] => 4 [2] => 5 [3] => 6 [4] => 7 } Percent array: Array ( [0] => 28 [1] => 39 [2] => 17 [3] => 28 [4] => 23 So it would end up like: Array ( [0] => Array ( [id] => 3 [percen...
Sorry for the capitals, I have spent all day dealing with stupid TFS instead of actually doing development work. I have a main branch and a dev branch. I merged changes from the main branch up into the dev branch fine. Now when I try merging up again it says there is nothing to merge. HOWEVER, when I merge down from the dev branch to t...
I am merging my development branch into the main branch. There is only a subset of files that I have changed in my development branch, all other files should remain unchanged. Logically, I only want to merge files which I've changed. I would not check in a file which I did not change. But when I do the merge operation in TFS, it mark...
We currently have a manual process when we update reports on live.. from our test environment.... to manually merge changes into our new development environment. This is tedious. Is there a way to automatically merge two version of the same report so both changes take? Is it possible to merge the xml report specs of the two? without ...
EntityManager.merge() can insert new objects and update existing ones. Why would one want to use persist() (which can only create new objects)? ...
I have run into a bit of a problem here: I had a problem-specific branch '28s' in git, that I merged in the general 'develop' branch. Turns out I had done it too fast, so I used git-revert to undo the merge. Now, however, the time has come to merge '28s' into 'develop', but git-merge command sees the original merge, and happily announces...
Hi, I am currently working on a project that has two phases, one of which is to be dropped later on. Development for phase 2 must begin, but bug-fixes for phase 1 will be on-going during this time. I want to branch from the phase 1 repo to start on phase 2 work, but many of the files will no longer be needed. I need to integrate any cha...
Hi, I am using Beyond Compare 3.0 and using the XML tidy and XML tidied with sorted attributes plugins. Its great and while I would like it to show me the "tidied" XML, Once I resolve me merge, I would like to save it back with the original formatting (not the tidied format). Is there anyway of doing this? For example, if I have these t...
I have an Access 2007 database that works asynchronously with a MAS200 database. Due to various office politics and red tape, I cannot get access to the MAS200 data, even though ODBC makes it easy, and must import data dumps from MAS200 to Access. Because of this and the way reports are run, I occasionally have duplicate data on a dump...
We have 3 databases that are physically separated by region, one in LA, SF and NY. All the databases share the same schema but contain data specific to their region. We're looking to merge these databases into one and mirror it. We need to preserve the data for each region but merge them into one db. This presents quite a few issues for ...
Hi, I'm new to SVN but have used Clearcase for years. My issue is I have some changes on a branch which I have merged back to trunk using TortoiseSVN "Reintegrate a branch" feature. Now when I look at the version tree I don't see any edge being rendered from the tip of the branch to the tip of the trunk, which I would expect to see. I...
Several months ago I learnt from here how to perform multiple updates at once in MySQL using the following syntax INSERT INTO table (id, field, field2) VALUES (1, A, X), (2, B, Y), (3, C, Z) ON DUPLICATE KEY UPDATE field=VALUES(Col1), field2=VALUES(Col2); I've now switched over to PostgreSQL and apparently this is not correct. It's re...
I have a source directory that includes a mix of different languages and files. Probably 100+ total files. I want to 'fork' that code and create a completely different version of the source. At this point, I will have version-1 of the code and version-2 of the code. I will not make that much development on version-1. I want to chang...
What is the easiest and quickest way to combine multiple pdf docs into a single pdf document, programmatically in C#? I am not looking for a random list of .net PDF libraries (there are loads on SO already), rather a specific library (and function) which will do what I need quickly and easily... Thanks! ...
Hi, i built an intranet on .NET MVC. I'm also building a separate planning tool in Winforms (performance choice). I would now like to 'open' the planning tool from the intranet (IE7) and pass an argument (e.g. Workorder number) so I can display the planning for that specific item. Is this possible? I have a .application file for the W...
Using the TFS merge tool, I can click on the left side and the right side to keep both changes/conflicts. This is needed when I add a method and another team member adds a method in the same place and I need to keep them both. In WinMerge (file merge, not folder), it seems that I can only overwrite the right with the left. Is it possi...