There are various automated processes that commit to my svn (1.5) repo. When I'm branched and merging in from Trunk, merging these commits results in spurious conflicts. Is there any simple way to skip commits by specific users? ...
Hi guys I have a string that looks something like the following 'test:1;hello:five;just:23'. With this string I need to be able to do the following. .... var test = MergeTokens('test:1;hello:five;just:23', 'yes:23;test:567'); ... The end result should be 'test:567;hello:five;just:23;yes:23' (note the exact order of the tokens is not ...
I have a SQL 2000 instance that has database with a transactional publication - tables only. It is subscribed to by a SQL 2005 instance - no problems. I need to publish some of the tables from this transactional subscription in a merge publication. Right now, I'm using another database in the SQL 2005 instance as the merge subscriber. ...
I've got three tables AUTHOR_TABLE ------------- AUTHOR_ID (PK) AUTHOR_NAME 1 me 2 you ARTICLE_AUTHOR_TABLE ------------- AUTHOR_ID ARTICLE_ID 1 100 2 101 EVENT_AUTHOR_TABLE ------------------------------------------ AUTHOR_ID EVENT_ID 1 200 1 201 All ...
Some sample data: DECLARE @TARGET TABLE ( ID INT, value INT ) ; DECLARE @SOURCE TABLE ( ID INT, value INT ) INSERT INTO @TARGET VALUES ( 1, 213 ) INSERT INTO @TARGET VALUES ( 2, 3 ) INSERT INTO @TARGET VALUES ( 3, 310 ) INSERT INTO @TARGET VALUES ( 4, 43 ) INSERT INTO @SOURCE...
We've already learned how to switch which branch points to what using git branch -m. If I do this, is it going to make life difficult for the other people pulling from my repository? Say I do a bunch of stuff on a branch topic1 and then do a git branch -m master old_master git branch -m topic1 master git push origin master and then s...
Simply put I am looking for a quick way to do the following. I would like to format an excel spreadsheet below: A B C D 1 foo bat abe test 2 foo bat cat test 3 foo bat dog test 4 bar moo hat girl 5 bar moo bat girl to look like this: A B C ...
Hello, Is there a way to put text on a png and then merge it wit a jpg / gif image? ...
I am evaluating git-svn and trying to determine how well it will play with a particular svn repository. I am mostly concerned with getting git-svn to perform merges in such a way that the svn:mergeinfo property is correctly set in the subversion repo. Is this possible? Here is what I have done so far: # Checkout the SVN repo. $ git svn...
How can I merge two MySql tables that have the same structure? The primary keys of the two tables will clash, so I have take that into account. ...
Are there command line merge tools for windows? I'm thinking in terms of tools that can be used in conjunction with other tools (e.g. git, unison) to resolve conflicts. Actually, it doesn't need to strictly be command-line based, as long as it "cooperate" with other command line tools (as I mentioned, git for example), then it's fine. ...
I had a feature branch of my trunk and was merging changes from my trunk into my branch periodically and everything was working fine. Today I went to merge the branch back down into the trunk and any of the files that were added to my trunk after the creation of my branch were flagged as a "tree conflict". Is there any way to avoid this ...
I wonder whether anyone ran into this issue before - I spend a dozen of hours but could not figure out. I am writing a Word AddIn in C++. The AddIn is to convert anything between < and >. It works just fine for plain text, but does not work on Mail Merge fields. For example, worked if I typed it, but if the same 'Jane' came from a ma...
Having problems with merging multiple ncover reports into one big report, I'm looking for a free alternative to ncover. It should have to possiblity to work with nunit, where nunit is configured to run 2 sets of tests on the same assembly (one set of tests is database independent, the other set requires a configured database). In the en...
I've got a source code tree in subversion with several branches. I've just finished a fairly intense debugging session in an otherwise active branch and now need to merge the changes across to the new branch. The new branch was taken off trunk (which represents released code) recently, after all the development in the old branch (obvious...
We have several large subprojects inside our main SVN project root. I commit and merge only my subproject when working with our release branches, mainly because it's faster. However, a colleague pointed out this reference to merging subdirectories in Version Control with Subversion (a.k.a "The SVN Book"): For long-lived release b...
Having two InputStreams in Java, is there a way to merge them so you end with one InputStream that gives you the output of both streams? How? ...
I'm writing a merge sort function, and right now I am just using a test case array (there is no input - this is static, for now). I don't know how to pass an array as an argument. Here is my code right now: //merge sort first attempt #include <iostream> #include <algorithm> #include <vector> int mergeSort(int[]); int main() { int orig...
No doubt some of you have seen my recent posting, all regarding the same program. I keep running into problems with it. To reiterate: still learning, not very advanced, don't understand pointers very well, not taking a class, don't understand OOP concepts at all, etc. This code just merges two sorted vectors, farray and sarray, into a si...
I'm after a tool to generate decent-looking documents from templates, that needs to: be invoked through code (not interactively) run on Windows, ideally invoked from code within a web-server process standalone* report files that contain their own internal data definitions, query options, etc (i.e. ideally so that we can push simple rep...