I had a lot of trouble recently merging a renamed branch back into trunk. I ended up having to resort to the command line to get the exact parameter setup that I wanted. Subclipse didn’t quite cut it, unfortunately.

To set the stage:

  1. All changes on trunk have been merged to the branch (complex-obs) and committed
  2. The checked out trunk copy is up-to-date

I created a patch file comparing trunk to the branch:

svn diff –old /home/ben/workspace/openmrs-trunk-clean –new http://svn.openmrs.org/openmrs/branches/complex-obs > /home/ben/openmrs/patches/complexobs.diff

I then applied that patch file to my local trunk copy:

patch -p0 < /home/ben/openmrs/patches/complexobs.diff

This should only be used if you plan on closing the branch. Subversion isn’t able to keep track of any ancestry this way, so future merges would be harder.

Note: Diff files don’t handle binary files. You will need to move those yourself. I suggest comparing the patched trunk with your branch to make sure everything is the same. (In eclipse, select the root of both projects, then right click–>compare with–>each other)

This is in the babble, openmrs category tagged as , ,

Add a comment »

If you don’t want to upgrade to use the gui update-manager program (update-manager -d) in Ubuntu, you can upgrade your system with the simple call to apt-get:

sudo apt-get dist-upgrade


This is in the babble category tagged as ,

Add a comment »

I’ve spoken previously about the travails of having a developer community that uses both Windows and Unix-based machines: merging files edited in both environments. Hopefully those days are over. (At least for the OpenMRS community)
…read the rest of this entry »

This is in the openmrs category tagged as , ,

6 comments »

I upgraded my laptop to Ubuntu 8.10 Intrepid Ibex a few days early. The latest release from Ubuntu seems almost complete. I kept a log of the things that didn’t work quite right after I upgraded. I filed some bugs, so hopefully these were fixed before the release:

…read the rest of this entry »

This is in the babble category tagged as , , ,

1 comment »

For security reasons, the latest OpenMRS now has the autocomplete=”off” html attribute on its login page.  This will prevent the users from seeing a dropdown of previously logged in users.

Unfortunately, this will cost developers precious seconds when writing and testing code.

I found this “Autocomplete On” greasemonkey script to re-enable autocomplete on all forms.  However, I want Firefox to fill in the admin/test username and password on the form for me, and even with this script it wasn’t doing that.

Luckily I was able to easily craft a new greasemonkey script based on that example. This script inserts “admin” and “test” into all login pages on any OpenMRS site.  Click here to download and install my script: openmrs-login.js (after installing the greasemonkey plugin).

This is in the openmrs category tagged as ,

5 comments »

« Previous Entries Next Entries »