What's the benefit of joedev branch in Hg?

This forum is only for questions or discussions about working with the mojoPortal source code in Visual Studio, obtaining the source code from the repository, developing custom features, etc. If your question is not along these lines this is not the right forum. Please try to post your question in the appropriate forum.

Please do not post questions about design, CSS, or skinning here. Use the Help With Skins Forum for those questions.

This forum is for discussing mojoPortal development

This forum is only for questions or discussions about working with the mojoPortal source code in Visual Studio, obtaining the source code from the repository, developing custom features, etc. If your question is not along these lines this is not the right forum. Please try to post your question in the appropriate forum.

You can monitor commits to the repository from this page. We also recommend developers to subscribe to email notifications in the developer forum as occasionally important things are announced.

Before posting questions here you might want to review the developer documentation.

Do not post questions about design, CSS, or skinning here. Use the Help With Skins Forum for those questions.
This thread is closed to new posts. You must sign in to post in the forums.
3/19/2012 8:20:47 AM
Gravatar
Total Posts 5

What's the benefit of joedev branch in Hg?

Hi Joe,

I have downloaded your code using TortoiseHg that I'm new to. I like the idea of two branches, defaut for stable and joedev for development. In concept, it gives a clearer view of code route. However, when I reviewed your revision history, I found most time you made a change in joedev branch and then merged to the default branch immediately. Is it too complex to work this way?

Can we work on one branch only, and make the stable or release information in the commit comments or tags of a revision? This may save half of revisions, thus make the code management much easier?

As I said I am new to TortoiseHg, and trying to understand in which case branches are useful. For teamwork with mutiple developers, it makes sense to setup a branch for each developer. I am currently working on a project on my own and manage source code using TortoiseHg on my local computer. Do you think it make sense for me to make a dev branch in addition to the default one?

Thanks in advance.

Weijun

3/19/2012 8:49:33 AM
Gravatar
Total Posts 18439

Re: What's the benefit of joedev branch in Hg?

Hi Weijun,

That is my private branch, you should use default branch, no-one but me should use my dev branch.

I do work only in my private dev branch and I merge changes to default when I believe they are stable. Many changes are small and I believe they are stable right away so I merge them right away to default. Only when I have some work in progress that is unfinished or not tested then I wait  until I'm finished before merging. It keeps it more simple to manage if changes I make are kept synchronized as soon as possible with the default branch. I don't like to accumulate a lot of changes in my dev branch for a long time and then merge a lot of changes all at once, my development and release cycles are very short and prgress happens very fast.

If you find a bug in default branch and I can validate it, it is usually fixed within hours if not minutes from when I can verify it.

I think yes, it is good for any developer with commit access to work in their own branch but the longer they go without keeping their branch synchronized it may get more difficult to manage merges especially if the devs are working on some of the same code and coding in different directions from one another. The more devleopers involved the more formal processes and planning need to be. With only a few developers it can be less formal and more nimble. Sometimes more developers actually slows progress down because of the need for more formal processes. Changes merged to default from individual developer branches also need to be merged to the other developer branches from default so that the only differences in any developer branch is what the developer is working on.

In some cases it might be useful to have additional branches for working on something experimental or proof of concept or some really major change in architecture that may not get merged for a long time if ever.

I'm sure lots of people have different ways and styles of working with source code management, this is just what I do.

Best,

Joe

You must sign in to post in the forums. This thread is closed to new posts.