[OT] Source Control Done Right

[Rystraum Gamonez]

Para po sa mga gustong mag-aral / curious / nalilito sa source code management at kung para saan ito,
baka po makatulong.

For those who want to study / is curious / is confused about source code management and what's it for,
maybe this could help.

http://thedailywtf.com/Articles/Source-Control-Done-Right.aspx

Rystraum Fabe Gamonez

[Darwin Bautista]

My head exploded because of the "Dimension" shiz.
It seems like the author is more familiar with centralized VCS like SVN.

Anyway, since I've dumped Mercurial in favor of Git (all my projects
now use Git),
I just want to share this development model that is very easy to
understand and use:

http://nvie.com/posts/a-successful-git-branching-model/

Maybe we can use this too if ever we decide to use Git for Halalan? ;-)

[Rystraum Gamonez]

I came across that article sometime ago, shared it with Liz but forgot to share it with everyone else.
The same branching model is what we (try to) use in projects.

I'm in favor of Halalan on Git. (And, afaik, it's really easy to move from Hg to Git.) Partly because
I never got around to using Mercurial for a very long time and have been using Git in all our projects.
I like the forking model over at Github too. It feels much more accommodating to changes. It's easy
to submit patches / changes for merging too.

If the current model works okay for us and that there's no evidence that moving would improve workflow
then I suggest we don't fix what's not broken.

Rystraum Fabe Gamonez

--
You received this message because you are subscribed to the Google Groups "Halalan Development" group.
To post to this group, send email to halal...@googlegroups.com.
To unsubscribe from this group, send email to halalan-dev...@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/halalan-dev?hl=en.

[Waldemar Bautista]

If someone could convert the repository of Halalan to Git and nobody
objects, then it's all good.

--
Waldemar Amado Bautista

[Darwin Bautista]

Hello,

Since we're still using Mercurial in the Google Code repo, I made a
test repo in GitHub:

https://github.com/baudm/halalan

I merged the 'up' repo back to the main repo because managing branches
in Git is a lot easier and pain-free.
I also merged the current development from the 2xx repo (because of
this, the Git repo has 2 root commits, but this is okay.)
Now, we only have 1 repo with 4 long-lived branches:

master - always contains stable, production-ready code (contents of
the 'main' Hg repo)
devel - will contain future developments (if ever there will be) to
Halalan 1.x (currently, devel == master)
up-system - will track the master and devel branches; contains
UP-specific changes (contents of the 'up' repo)
2xx - will house the development of Halalan 2.x (contents of the 2xx
repo). This will be deleted once its changes are merged.

Why merge the 2xx repo this early? So that we can easily merge the 2xx
branch to devel (or even master) once Halalan 2.x is ready. :)

As always, comments and suggestions are very welcome. :)
(I haven't converted the docs and wiki repos yet.)

Regards,
Darwin

[Waldemar Bautista]

I think it's okay to make the changes in Google Code already. Hehe.

--
Waldemar Amado Bautista

[Darwin Bautista]

Git uses the "Name <us...@email.com>" format to identify the author/committer.
For some people who contributed, this information was not available
prior to the repo conversion.
Thus, the conversion tool used 'devnull@localhost' as their email address:

aicapalce <devnull@localhost>
ardzeii <devnull@localhost>
diwadm <devnull@localhost>
rystraum <devnull@localhost>
toniosm <devnull@localhost>
waoliveros <devnull@localhost>

If you want to change your log name to something like "Firstname
Lastname <us...@email.com>," please notify me. :)

Also, if no one is against the idea of migrating to Git, since sir
Wali already approved it, I'll push the Git repo to Google Code on
September 18. :)

Regards,
Darwin

[Darwin Bautista]

Hello,

Since I had nothing to do at work today, I was able to finalize the Git repos.
The old repo organization was preserved; only the 2xx repo is disabled.

The changes in the 2xx repo has been merged to the default repo, in
the 'feature/2xx-rewrite' branch.
See this wiki page for more info:
http://code.google.com/p/halalan/wiki/GitDevGuide

Regards,
Darwin

[Waldemar Bautista]

On Thu, Sep 15, 2011 at 7:49 PM, Darwin Bautista <dar...@gmail.com> wrote:
> Since I had nothing to do at work today, I was able to finalize the Git repos.
> The old repo organization was preserved; only the 2xx repo is disabled.
>
> The changes in the 2xx repo has been merged to the default repo, in
> the 'feature/2xx-rewrite' branch.
> See this wiki page for more info:
> http://code.google.com/p/halalan/wiki/GitDevGuide

This is great. Thanks!

--
Waldemar Amado Bautista