The Deployer

June 26, 2008

Subversion 1.5 released

Filed under: Subversion — Lucian Daniliuc @ 06:25

A new version of Subversion :) has been released. Subversion 1.5 brings some really useful features, like Merge tracking and Interactive Conflict Resolution (client).

Until now, when running svn update on a linux commandline that included a conflicted file, you would get a really messed up set of file regarding the conflict. That is why a HTTP server would have to be stopped while updating, since it would make the website/application unusable.

But now, thanks to Interactive Conflict Resolution, you could do something like the following (described on their site):


$ svn up
U contrib/client-side/svnmerge/svnmerge_test.py
Conflict discovered in 'contrib/client-side/svnmerge/svnmerge.py'.
Select: (p) postpone, (df) diff-full, (e) edit,
(s) show all options: s
(p) postpone - mark the conflict to be resolved later
(df) diff-full - show all changes made to merged file
(e) edit - change merged file in an editor
(r) resolved - accept merged version of file
(mf) mine-full - accept my version of entire file (ignore their changes)
(tf) theirs-full - accept their version of entire file (lose my changes)
(l) launch - launch external tool to resolve conflict
(s) show all - show this list

Select: (p) postpone, (df) diff-full, (e) edit,
(s) show all options: tf
G contrib/client-side/svnmerge/svnmerge.py
Updated to revision 25685.
$

And finally, Merge tracking means Subversion keeps track of what changes have been merged where. This reduces the overhead involved in maintaining branches, and gives users a way to inquire what changes are merged — or are available to be merged — on different lines of development.

Also, VisualSVN version 1.5 has been released to go with the latest features of Subversion.

June 4, 2008

CSS Step Menu

Filed under: CSS — Lucian Daniliuc @ 09:43

Step menus are useful when users have to go through some steps in order to confirm a registration or any other purpose. To make the users know where they are and what the steps are, you can use these nice step “menu” (I think menu is not exactly the right way to say it).

It looks like this…

All the details are here .

June 2, 2008

Linux I/O Redirection

Filed under: Linux — Lucian Daniliuc @ 14:26

Redirecting the output is useful everywhere, including in php.

By using `exec()` to import a .sql file into mysql, everything goes smoothly. Until you get some errors. Mysql sends the errors it encounters to stderr instead of stdout.

So… you get the command status 1 (something went bad), but no error message, so you don’t even know where to start.

That’s where the linux I/O redirections t come in handy.

To get the error message as well into the output, you have to add the following extra stuff to the end of your command line that is being passed to `exec()`:

2>&1

Now you also get the error messages in your response.

jQuery iPod-style Drilldown Menu

Filed under: CSS — Lucian Daniliuc @ 11:35

Great drilldown menu free to reuse and modify to anyone’s needs.

All the details are here… http://www.filamentgroup.com/lab/jquery_ipod_style_drilldown_menu.

Have a nice day!

Powered by WordPress