Hi, Well, I'm sure this question has been asked before but I'm yet to find a single solid answer to it. I'm in the process of creating a solution that involves remote offices uploading data to one master db via web service. Basically, each office will have a windows service that runs every 1hr or so, picks up any new data into a dataset...
I have two STL vectors A and B and need to merge them into a third one, where the elements should be ordered in a way, that every nth element in the output vector should be of vector B. My current code looks something like this: std::vector<int> a(10, 4); std::vector<int> b(10, 8); std::vector<int> c; static const std::size_t STEP(3); ...
I'm working on a project and I see several merge commits from another developer. For some reason, he was merging an unfinished topic branch into our master branch on a daily basis. I want to see all the commits from his topic branch, but I can't just check it out because it was never pushed to the remote repo. So what I want to know is...
I have a repository I will call 'subset' which was cloned from another repository I will call 'full'. I deleted many files in subset using 'hg rm'. I now need to pull changes to the files remaining in subset from full, but I don't want to restore any of the files I deleted. If I do a pull followed by a merge, the merge will interacti...
Good day, I am retrieving information from various websites using cURL and various parsing techniques. I made the code so I can, if desired, add additional websites I scan information from. The information retrieved is as follow : (Please note that the information may be inaccurate and may not reflect real price/name) Array ( [web...
I'm trying to LINQ two tables based on a dynamic key. User can change key via a combo box. Key may be money, string, double, int, etc. Currently I'm getting the data just fine, but without filtering out the doubles. I can filter the double in VB, but it's slooooow. I'd like to do it in the LINQ query right out of the gate. Here's the da...
Hi, I was wondering what is the best way to handle a request for an update on an existing entity (e.g. a Person) when receiving the request as a webservice request. In my project I have a Person domain class and I would like to expose CRUD operations as webservice operation through the CXF plugin. So I make a PersonService, and expose...
This post refers to this page for merging SQLite databases. The sequence is as follows. Let's say I want to merge a.db and b.db. In command line I do the following. sqlite3 a.db attach 'b.db' as toM; begin; <-- insert into benchmark select * from toM.benchmark; commit; <-- detach database toM; It works well, but in the referred si...
I have a very messy TFS structure that I am trying to clean up (thanks to my predecessor). I now have a situation where I need to bring changesets selectively from one branch to another where they don't have a parent/child relationship and I don't want those changes to pass through their shared trunk. How can I do this? I have tried a...
Someone branched our trunk and now I need to checkout the new branch. I already have trunk checked out locally. Since its a huge repo with GBs of files, it will take forever to checkout the new branch. But since very few files have changed between the trunk and the new branch, how can I just copy my local trunk, call it the branch, then...
Hey, we started working with development- and featurebranches and it is actually quite useful. But, as we do most of the bug fixes in development branches it often happens, that I work on several things at a time, waiting for them to be reviewed by our QA. Now I fear that I will forget to merge a changeset/revision back into trunk after...
The context public class Item { public int Index; public string Text; } ... var items = new List<Item> { new Item {Index=1, Text="Data #1"}, new Item {Index=8, Text="Data #8"}, new Item {Index=4, Text="Data #4"}, }; The code var data = (from item in items orderby item.Index select item)...
Hi, I have two tables: data and comments data: ------------------- id | name | email | pics: ------------------- msg_id | pic | The data is assosiated by id and msg_id. How I can merge this two tables into final one? Edit: some rows in data don't have associated a pic, and i need to keep them. ...
I have an application using Tomcat/Spring 3/JPA/Hibernate but my merges do not commit to datbase. This is the configuration: spring-conf.xml: <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"> <property name="driverClassName" value="com.mysql.jdbc.Driver" /> <property name="url" value="jd...
Suppose I have a class 'Cheese' with fields type and purchaseDate, such that: public class Cheese{ CheeseType cheeseType; String purchaseDate; public setPurchaseDate(String value){ purchaseDate=value; } public Class CheeseType{ String type; public setType(String value){ type=value; ...
I have two git repositories, one "upstream", that somewhat contains the code from upstream author ( was reacted by an ad-hoc script parsing his in-house rev store ), and the other is the repository I've been working in, which is based on one revision on the upstream repository, but uncertain which. I've tried going an git rebase, but i...
I was asked to do a report that combines 3 different crystal reports that we use. Already those reports are very slow and heavy and making 1 big one was out of the question. SO I created a little apps in VS 2010. My main problem is this, I have 3 Datatable (same schema) that were created with the Dataset designer that I need to combine....
Is there any tool, commercial or freeware, that allows merging OCX files with .NET executable? I know it's possible to make an isolated OCX reference, but that's not sufficient in my case, I need to get a single exe without installation requirement. Thanks. ...
hi to all. I am new to php. I need some help. I had a array as Array ( [_] => Array ( [0] => [1] => ) [123_] => Array ( [0] => 123 [1] => ) [1234_] => Array ( [0] => 1234 [1] => ) ) Array ( [_] => Array ( [0] => [1] => ) [12345_] => Array ( [0] => 12345 [1] => ) [1234_] => Array ( [0] => 1234 [1]...
After a merge failed with some conflicts I can list those with git diff, but git difftool won't display them with the difftool set in the config(in my case Kaleidoscope), instead it will just use normal diff. A git difftool comparing with a previous commit will work. Is there a way to use git difftool on merge conflicts? Greets Jan ...