Entries Tagged 'Intuitive Desktop' ↓

Bye Bye Subversion. Hello Bazaar.

bzr branch http://intuitive-desktop.org/bzr/main/

Merging is SOOOOO much easier in Bazaar.

Also. I stumbled over a tool called Meld Diff that is very useful when you need to perform complex merges that can’t be performed automatically.

Look at the pic. You can click the little arrows to merge each section, one-by-one.

I don’t care if the problem is Dreamhost or Subversion. All I know, is that I get home from work at 7 PM and have to go to bed at 10PM. In that small window, (where I am alive, and cease bing a cog in a really antiquated machine) I want to get work done on my project.

And I can’t. For the past week, I have been trying to simply compare two branches. I’m not even at the fucking merge stage. Just comparing. It either takes 30 minutes, or fails with some strange error (possibly a timeout):

svn: PROPFIND request failed on '/intuitive_desktop/!svn/bc/209/trunk/IntuitiveFramework/Models'
svn: Processing PROPFIND request response failed: required string: "lp1:version-name" (/intuitive_desktop/!svn/bc/209/trunk/IntuitiveFramework/Models)

I keep having to push the release of 0.5 back, because of shit like this. So close and yet so fucked in the side of the head.

Whew! Making a screencast is a huge pain in the ass. But here it is! The first screencast describing the Intuitive Desktop. It is a little messed up though. But watch it. It should be enough to get started with the documents. Comments are welcome.

(20 MB OGG) -

And for the love of Reason. Please mirror this of you are going to link it to a high bandwidth site.