I'm looking for a side-by-side diff program a la xxdiff or DiffMerge that, instead of diffing files, allows blocks of text to be dragged into either the left side or right side window. I'm refactoring some SQL embedded in source files, and it would be nice to drag the sql statements from each source file into the diff program instead of...
Hi.. how do i access the procedure parameters inside the same procedure using a query for example: see this procedure procedure game(left in tab.left%type,right in tab.right%type,...) is --some local variables begin merge into tgt_table using subquery --(here is what i need to use the parameters) on some condition when mat...
I have two sub-directories each with a repo, thus : PPP/ |--ABC/ | |--.git/ | |--AAA/ | | BBB/ | | CCC/ | |--DEF/ | |--.git/ | |--DDD/ | |--EEE/ And would like to combine them into one repo, so, I would assume the directory structure would be like this: PPP/ |--.git/ |--ABC/ | |--AAA/ | |--BBB/...
I need to import data from an excel file, but some field is a merged cell. How can I determine if a field is merged or not, and how many cells are merged together in that field? My code is like this: Dim Conn, DBPath ,Rs Set Conn = Server.CreateObject("ADODB.Connection") DBPath = "Driver={Microsoft Excel Driver (*.xls)}; DBQ=" & Ser...
I have a git repository with 2 branches: master and test. There are differences between master and test branches. Both branches have all changes committed. If I do: git checkout master git diff test A screen full of changes appears showing the differences. I want to merge the changes in the test branch and so do: git merge test ...
I'm using msys Git for source control on a Windows machine and I'm trying to figure out how to get my merge tool, WinMerge, to work with Git. I've followed the instructions on this blog to the best of my ability since it's the closest I've found to what I'm trying to do. Basically what I did was: Modify my .gitconfig file to include th...
I have an interesting problem for Interbase. I have a record set which amongst other things has a data entry field and a timestamp for each record. I would like to be able to copy the timestamp from records so that at the end of the day the final field will read along the lines of: TIMESTAMP <Carriage return> <carriage return> Origina...
I need to limit access to merge changes into the trunk to specific individuals. Is there any way to limit merge rights on specific folders in subversion? I don't want to block merging from branch to branch, only into the trunk. ...
I know this question has probably been asked already but I would really like to know of a program that will show line by line the differences between to word documents. Thus I need a word document format that supports this (.doc, .docx and .ods obviously don't). Are HTML and XML the only formats that come close to supporting this featur...
I have an MS access database file with 2 tables: t1, t2. Both have primary key, suppose id, but t1 has 3 columns A, B and C, while t2 has columns D, E AND F. Both have the same rows, but each has different columns as stated. What is the easiest way to merge these two tables? Note that they are very big, and exporting to excel, CSV and ...
If I run the two statements in batch will they return one table to two to my sqlcommand object with the data merged. What I am trying to do is optimize a search by searching twice, the first time on one set of data and then a second on another. They have the same fields and I’d like to have all the records from both tables show and be ...
I have two small git repos. The projects both started from different points but converged to a very similar one (same file names, folder structure, etc). One is not a branch of the other, but one can be considered an evolution of the other. It would be nice if I could merge the two so that repo2 is the continuation of repo1. Is this ...
In my plugin de.support.help are the plugin.properties files. These properties files include the strings for the preference page. I want to use this plugin for different customers, but the customer name is inside the properties files. I want to patch the properties files by using the eclipse fragment mechanism. As far as i now the fr...
I need to merge two two mysql databases with identical schema. I am looking for some tool that can read database meta-data (PK, FK) and automatically generate new PKs, updating all the FKs automatically. ...
I made some changes and commited them (to version 2), and found out that they introduced new bugs to my program some minutes later. So I switched to some of the files to an older version to get some of the files back to version 1 on my local platform. Since then I have made a lot of changes I don't want to lose, and I have used commit (v...
The company where I work has been trialling scrum on a project and is now looking to roll scum out to three or four different project teams. We are envisaging that these teams will work in separate feature branches (we are using SVN). We are not sure if the different teams’ sprints should end simultaneously or if we should stagger the ...
I have an array like the following Array ( [0] => "txt1" [1] => "txt2" [2] => "txt3") I have another array like it but with different content : Array ( [0] => on [2] => on) The aim is to get a final array with the keys of the second and the content of the first, it's like merging them. So that the final result is : Array ( [0] => "...
From a VBS script I have to work with an Excel book with the format: | A | B | C | ----|-----------|-----------|-----------| 1 | Header1 | Header2 | Header3 | ----|-----------|-----------|-----------| 2 | FOLDER1 | | | ----|-----------|-----------|-----------| 3 | Item1 |...
We have a setup with a development "trunk" in our recently-migrated-to-from-VSS TFS system and developers have been doing work in branches off the trunk, which are merged back in. We've been diligently commenting our changesets at check in time, something we never did in the VSS days. However when I right-click on a trunk file in the S...
I'm trying to perform a soft delete on a row in my target table using the SQL server 2008 MERGE command. I think this should fall under the "when not matched by source" section, since the source is missing the row and the target still has it. All I want to do is set the IsActive bit to false, but I'm getting an error. "Attempting to s...