If you are not a software developer you might not have heard of the term code merging or tools like WinMerge.
In this post, you can see how I use Winmerge to merge my changes with the K2 svn and keep it in sync with the lastest development.
I want to share this because some people asked me about my AdAdvantage scheme update. Unfortunately I do not have the time to follow each svn update, but you could use this tip to help yourself. This is especially useful if the lastest version fix a bug in the version you are using.
The first step is of course to download and install WinMerge.
After that, download the latest K2 svn build. Uncompress into one folder
Next, download the latest AdAdvantage or use the changes you had made. Keep this in another folder.
The next few steps will describe how to use WinMerge. But don’t stop here. Explorer further and you will find alot of other uses.
- Open the 2 folders to compare and check Include Subfolders.
- Click and you will see a comparison result like this:
- Under the Comparison result column (click on it to sort), you will see Files are different. These are the files that are different between the K2 svn version and your version. Double click on one of these files and you will get this:
This shows you the exact differences between the lines.- Double click on the yellow line and it will turn pink
- Right click on the pink line and you will see a menu
- You can now copy the changes to the left or right
- You can also manually edit the text by typing on the left or right column
- After making all the changes, save the file and close the the windows
- Go to the next file
- You may also see Only in … in the Comparison result column
These are files available only in one folder. They could be files that are just added.
Right click on these files and copy them to the right or left folder depending.
I just use these few simple steps to keep my changes in sync. Hope this helps you.
thanks! this is great
sounds cool… i might try it.. although I hessitant about upgrading…
Give it a try… it is easier than it sounds
Having modified all changed files, the file which starts K2 is giving me grief:
START PHP CODE
/* Current version of K2 */
$current = ’svn’;
/* Blast you red baron! Initialise the k2 system */
require (TEMPLATEPATH . ‘/app/classes/k2.php’);
K2::init();
END PHP CODE
When I enter my domain name in the browser I get a function not defined error and the whole thing comes to a screaming halt.
I have double and triple checked that all changed files have been uploaded to the server. Any ideas as to why I might be having this problem?
GaryO