Gregory (Grisha) Trubetskoy wrote:
On Sat, 22 Oct 2005, Jim Gallacher wrote:
Just a note on updating src/include/mpversion.h. Should we be changing
MPV_PATCH in svn trunk (and by extension MPV_STRING) to track the beta
release patch level? In trunk we are still at MPV_PATCH 0, but in
tags/release-3-2-2b we are at MPV_PATCH 2.
Hmm... It looks like you've set the version number in the tag.
Yep.
The tags
should be completely static (i think there may be certain instances
where you modify the tag but that's very rare).
OK.
The version should have
been set in the trunk, _then_ you create the tag.
I'm not entirely clear when you say trunk if you mean my working copy of
trunk, or the trunk in the repository.
This is the way I've been doing:
svn copy $URL/trunk $URL/tags/release-3-2-xb
svn co $URL/tags/release-3-2-xb
cd release-3-2-xb
#(Change the version info)
svn ci -m "tagged for release"
#(proceed with the packaging)
Alternative 1 - no version changes get committed to trunk:
svn co $URL/trunk trunk
cd trunk
(Change the MPV_STRING to "3.2.xb")
cd ..
svn copy trunk $URL/tags/release-3-2-xb
svn co $URL/tags/release-3-2-xb
#(proceed with the packaging)
Alternative 2 - two version changes get committed to trunk:
svn co $URL/trunk trunk
cd trunk
# (Change the MPV_STRING to "3.2.xb")
svn ci -m "changed version in trunk"
cd ..
svn copy trunk $URL/tags/release-3-2-xb
cd trunk
# (Change the MPV_STRING to "3.2.x+1-dev")
svn ci -m "changed version in trunk"
cd ..
svn co $URL/tags/release-3-2-xb
#(proceed with the packaging)
Techincally the right way to solve this now is to merge the changes into
the trunk,
I'm not clear on what you are saying here. Merging changes from where,
exactly? Or do you mean to merge the changes in tags/release-3-2-2b back
into trunk? I don't see the point in that since the only thing I changed
in tags/release-3-2-2b was the version info.
> though I'll admit I've never done a merge with svn (yet).
I was playing around with svn merge (NOT on the mod_python repository ;)
) a couple of weeks ago and it was the first time I've been disappointed
with subversion. It wasn't nearly as automagical as I was hoping. In
fact when you merge 2 branches there are circumstances where one file
will completely replace the other, which messes with the log record for
that file, or if the target has some changes not in the source file, the
changes in the target may will be lost.
Another way is just to edit mpversion manually in the trunk ;)
While on the subject - didn't we have some experimental 3.3 stuff - is
that in SVN, and if so, is it in the trunk, or do we have a branch for
this?
Nicolas's SQLiteSession.py is still there, but it's the only
experimental stuff. Perhaps we should create a new experimental branch,
or have individual branches for messing around.
Jim
