Jan Pazdziora wrote:
On Thu, Sep 04, 2008 at 10:37:13PM -0400, Jesus M. Rodriguez wrote:
Let me know what you think?
https://hosted.fedoraproject.org/spacewalk/wiki/Branching
With git, HEAD is a tip of the current branch. So we probably want
s/HEAD/master/g
Also, the
1. everything goes into HEAD (err, master)
statement is not quite true because we have other branches for some
features (that would destabilize master too much). It might read more
like
1. the main development and bugfixes go into master
2. experimental stuff and big changes might have their own branches
3. when stabilizing code for a release, branch is cut from master
...
In that branches.txt file, se probably want
s/HEAD/master/g
s/TRACKING FLAG/TRACKING BUGZILLA ALIAS/g
Wiki and branches.txt updated.
(back to wiki/Branching)
The wiki says
The current version is x.y.0. It was built from the RELEASE-x.y
branch.
and then continues to talk about x.y.1 ... I assume that at least for
now (Spacewalk 0.2, 0.3, 0.4), we do not plan to do any "maintenance"
releases off those primary 0.2, 0.3, 0.4 releases. So we branch
RELEASE-0.2, we do the final touches for Spacewalk 0.2 there, and that's
it -- no further development there. Or is there?
You're correct. Once 0.2 is out, it's DONE. I removed the section
talking about RELEASE-x.y.1.
The wiki says
The version files in HEAD contain 0.2 {release}.{rhel_ver}.
Does this mean the version files of Spacewalk project (do we have
something like that?) or version files of individual packages?
If the later ... we've got rid of version files for most if not all
of packages and we track the version-release in .spec. And in most
cases we use
0.2.x 1%{?dist}
to allow bumping the third part of the version using
make tag-release
during the master and RELEASE-0.2 iterations / builds.
Correct, I updated the wiki. I didn't mention make tag-release
in the branching file because that's covered elsewhere. Let me know
what you think.
Sincerely,
jesus
--
jesus m. rodriguez | [EMAIL PROTECTED]
sr. software engineer | irc: zeus
rhn satellite & spacewalk | 919.754.4413 (w)
rhce # 805008586930012 | 919.623.0080 (c)
+-------------------------------------------+
| "Those who cannot learn from history |
| are doomed to repeat it." |
| -- George Santayana |
+-------------------------------------------+
_______________________________________________
Spacewalk-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/spacewalk-devel
