Re: Merge to halalanup branch

[Darwin Bautista]

UPDATE:

hg URI: https://daruuin-halalan.googlecode.com/hg/

Google Code page: http://code.google.com/r/daruuin-halalan/source/list

Also, our live demos are up and running once again. They can be accessed here:

https://unplug.eee.upd.edu.ph/halalan/demo/

default - latest code from the 'default' branch (you can think of it as SVN trunk)

halalanup - latest code from the 'halalanup' branch (from my hg clone; basically halalanup + 1.5.0 changes + CI 1.7.3 update)

release - code from the latest release (currently 1.5.0)

On Sat, Dec 25, 2010 at 11:57 AM, Darwin Bautista <dar...@gmail.com> wrote:

Hi devs,

First of all, Merry Christmas to all!

I've merged all the latest changesets in the default branch (and backed out the new DB-related changesets) to the halalanup branch.

The merge was not an easy and straightforward one (several 3-way merges). As such, I haven't pushed the latest commits back to the halalan repository yet. Anyway, the "new" halalanup branch is essentially the current halalanup branch + post 1.5.0-alpha changes + CI 1.7.3

You can clone the repo with the merged halalanup branch here:

https://daruuin-halalanup.googlecode.com/hg/

Take note that this is just a temporary clone. I think you can also push your changesets here.

Also, you can view the changes here (currently only three new changesets):

http://code.google.com/r/daruuin-halalanup/source/list

- Darwin