merge after pull failed

Did a commit on both repositories. The pull worked fine but the needed merge failed with abort: outstanding uncommitted changes. Checked again the status but there was no M. After some reading I encountered that deleted but not removed files ! are ignored by the commit but not by merge.

fix: hg remove <file>

Now the merge run, but let to unresolved merges. After merging the files by hand the commit failed with abort: unresolved merge conflicts. hg resolve -a showed that Mercurial didn't recognise the merges done by hand.

fix: hg resolve -m

This marked all the unresolved merges as resolved. After this the commit worked as expected.

get text only from selected element

The jQuery method text() returns the text not only of the selected element, but also of all sub elements.

To get only the text of the selected element clone it first, than remove all children. After this call text().

changing Java version on Mac crashed eclipse

Checking the javac version from command line told me I was using 1.5. To change this I changed the Current and CurrentJDK. This worked fine for Java programs run from the shell.

The next restart of eclipse failed. Remembering that there should be a new version for Cocoa by now I downloaded the new 64bit eclipse version. Crashed with the same error messages.

Changed -Dosgi.requiredJavaVersion in eclipse.ini to 1.6 -> crash

Added Info.plist in Eclipse.app the line to require a specific Java version -> crash

Searching the internet for a solution I encountered the changing the link to select a Java version will bite you. This should be done with Java Preferences (Spotlight). Unfortunately the tool didn't start. Setting the links back to A changed this. With this tool you change the ordered of the preferred Java version.

With this changes eclipse started - and noticeably faster. The Activity Monitor now shows Intel (64bit). On the shell javac is now also 1.6.

ERDesigner NG

Downloaded and installed the open source ER tool ERDesigner NG written in Java. This will run on Windows, Linux and Mac OS X.

SQLite is not supported. To start drawing a design you need to define a database connection. It is possible to use a dummy one.

Adding attributes to a table not difficult as you need to press update before you add a new attribute or the last one added will be lost.

You can't declare a private key. You need to define an index for an attribute, this will now become a private key.

After this I stooped and deleted the tool.

SQLite database acces in NetBeans

Download the SQLite NetBeans plugin.

Add this to NetBeans: Tools - Plugins - Downloaded (Add Plugins).

Download the SQLite JDBC driver.

Add this to NetBeans: Tools - Java Platforms (J2SE - Sources).

Go in NetBeans to Services. Right click at Databases - Drivers - SQLite and select Connect Using .... Add the path to the SQLite database jdbc:sqlite:/home/...