Ticket 91 #92

Merged
merged 8 commits into from Apr 2, 2012

Conversation

Projects
None yet
4 participants
Contributor

nmpetkov commented Mar 28, 2012

Improving caching in News module: Ticket #91

Unknown referenced this pull request in zikula/core Apr 1, 2012

Merged

Optimize Theme caching: Ticket #315 #317

Member

hvorragend commented Apr 2, 2012

@espaan

Do we need two branches (master+release-3.0.x) at the moment? As far as I know there is the same code in both branches. I deleted the release-branch in EZComments, too.

So it is easier to merge the pull request into both branches.

We can create a new topic branch later on.

Member

espaan commented Apr 2, 2012

It is not really necessary indeed, since development is quite slowish.
I'm busy as hell
with other things. When reall full speed stuff is there again we can
create a specific release branch for bug fixing alone and new things
in master.

merging and development is some more work indeed. Although with a
cherry pick in a
git prog with GUI it is also quite fast.

@espaan

Do we need two branches (master+release-3.0.x) at the moment? As far as I know there is the same code in both branches. I deleted the release-branch in EZComments, too.

So it is easier to merge the pull request into both branches.

We can create a new topic branch later on.

@hvorragend hvorragend added a commit that referenced this pull request Apr 2, 2012

@hvorragend hvorragend Merge pull request #92 from nmpetkov/Ticket_91
Ticket 91
34e856c

@hvorragend hvorragend merged commit 34e856c into zikula-modules:release-3.0.x Apr 2, 2012

Owner

craigh commented Apr 2, 2012

+1 to removing additional branches. I have done the same in other projects as well. It sounds like Erik is too busy ATM, so Carsten feel free to do it IMO. erik?

Owner

craigh commented Apr 2, 2012

@Drak is there a way to ensure both branches are identical?

@ghost

ghost commented Apr 2, 2012

Removing branches is a big mistake.

Owner

craigh commented Apr 2, 2012

drak - is there any way to ensure branches are identical?

WHY do you believe removing branches is a bad idea?

@ghost

ghost commented Apr 3, 2012

@craigh - you can just do git diff master release-3.0.x to see if they are different. If the master branch and release-3.0.x branch are truly identical then you could of course just delete the release-3.0.x branch but then you are varying the workflow of bugfix ad feature branches. You are definitely going to need the master branch soon for Core 1.4.

There is also a misconception that you must merge immediately up all branches. It is common in large projects to merge up in chunks, for the case of News, if there really is no work going on in master, then you could just leave it, and once work begins it's just one command, git merge release-3.0.x after checking out master. In core, for example, I tend to merge into master every few days, not immediately for every PR on release-1.3.

Contributor

nmpetkov commented Apr 3, 2012

I think some projects are suitable, some not (to have branches). If development of a project keeps always in working (production) shape, branches are for historical purposes and some bug removal in old versions.
If a project will be refactored in "dangerous" way - keep "always" working ("production") branch, but master is for those big changes.
For example AddressBook, which I found is no working at all in current project, lacks of working ("legacy"?) branch. And to have such a working branch I opened one more project :-)
Actually suitable place for this working project I to be branch for main project.

It is also good idea to make note at project description: what to download for usage, and where to make pull requests for development.

Guite referenced this pull request in Guite/MostGenerator May 23, 2012

Closed

Improve caching #164

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment