Skip to main content

Test Driven Merging


Few weeks a go, I was doing some source code merging works. Some features developed in some branches of the repository were merged into some other branches. For the simple merging tasks, we directly use the "svn merge" command. But, in most of the times, we can't achieve what we need just using the "svn merge". That is, because the branches we do the merging between, have been grown largely, and independently.

For these situations, we have to use a good merging tool such as "Meld". Actually, this is the best tool I have ever seen for this task.

"Meld is a visual diff and merge tool. You can compare two or three files and edit them in place (diffs update dynamically). You can compare two or three folders and launch file comparisons. You can browse and view a working copy from popular version control systems such such as CVS, Subversion, Bazaar-ng and Mercurial." [http://meld.sourceforge.net/]

When you merge some thing did by other person in some other branch, there may be some difficulties, because you may don't know the exact files and places to add the modifications. In this type of situations, it is easy to start the merging from known place such as an UI. After merging that known place, you can run the application, and through the error messages you get, you can find all the other places that are to be merged. Usually, you can do this by starting in a place such as an UI and it will end up in a place such as a data base table eventually. Although this method is very simple, I found it is very effective, and you can finish the whole process in a less time. This is a test driven way, so I would like to call it as “Test Driven Merging”.
Labels:

Comments

Post a Comment

Popular posts from this blog

How to create a new module for vtiger...

Recently, I had to create a new module for vtigerCRM for my client in current working place. I did search in many places including the official vtiger sites, but couldn’t find a better documentation for my purpose. The latest vtiger version at that time was 5.0.3. Because I had some experience doing lots of core modifications for this system, I did decide to read the source code and find how to add a new module. Finally, I could create a new module and started the project. So, I thought it will be a good thing to write some thing on my blog about this topic, so that others who want to do this thing can read. Given below is a brief description about how to create a new module for vtiger CRM 5.0.3. Source code of this example module is also available to Download . Step 01: Creating the module directory and minimum required files. Create a directory called “newModule” inside your vtiger modules directory, or any other name that you prefer. Now, module index file should be created. Creat
49 comments
Read more

How to create a waveform animation with HTML and JavaScript

Recently, for a pet project, I wanted to create an animation of a waveform based on the varying decibel level of the microphone input. I was thinking about a really simple way to accomplish this with SVG and JavaScript. Given below is the first sample code I did on the Codepen. You can change this code to use with any framework of your choice. For this sample code, I am using a random number as the microphone input. You can replace it with any other time based input. Code Pen : https://codepen.io/nadeeth/pen/vmaYXw For this example, you need an HTML code snippet like the one given below. It’s just an SVG with a Polyline element inside.  <div style="text-align:center">   <svg height="150" width="400" id='svg'>     <polyline id="polyline-id" fill="none" stroke="#005c66" stroke-width="1" />   </svg> </div> And then the plain Javascript code to animate the polyline. You can
14 comments
Read more

De Morgan's Laws in Programming

Recently, while I was reviewing some codes, I saw there were some conditional statements that check for the same condition but written in different ways. Most of these statements were written with common sense without using any mathematical analysis, since those are too simple to go for a more formal approach. The two identical conditional statements that has been written in different ways are given below. 01) if ($comment['deleted'] == '1' || $comment['approved'] == '0') {                 unset($conversationsArray[$key]); } else {                ++$count; } 02) if ($comment['deleted'] == '0' && $comment['approved'] == '1') {                ++$count;              } else {              unset($conversationsArray[$key]); } Obviously, the above lines say that the inverse of the first condition is equals to the second condition and vice versa. That is...  ($comment['deleted'] == '1' |
12 comments
Read more