On 16 Dec 2008, at 11:43, Kevin Brown wrote:
On Mon, Dec 15, 2008 at 3:58 PM, Ian Boston <[email protected]> wrote:
I think I would do it a slightly different way.
Make the changes to trunk, if they are generic (is not about missing
version numbers etc)
Merge or cherry-pick into the 1.0.x-incubating branch
It's the cherry picking I'm not clear on. I'm familiar with how to
do this
with other source control systems, just not SVN. Was my previous email
correct?
:)
I might have missread your email... so be prepared to ignore the
following.
The method was correct, but I think its probably wrong to commit to a
tag.
I am tempted to say its bad practice to get into the habit of touching
a tag at all.
(assuming when you said RC you meant tags/1.0.0-incubating-RC1-test,
but re-reading you could have meant branches/1.0.x-incubating)
The svn command to merge looked right. eg
svn co https://...../branches/1.0.x-incubating 1.0.x-incubating
cd 1.0.x-incubating
svn merge -r1234:2345 https://...../trunk/ .
# check the merge with
svn diff
# check in
echo "Merging in -r1234:2345 to branch " > merge.log
svn log -r1234:2345 >> merge.log
svn commit --file merge.log
and then do the release from the branch
I have made the changes already, and I am doing a new tag that should
appear at
tags/1.0.0-incubating-RC1-test2
in a moment.
Ian
perform a release from the branch to a new tag with
mvn -Prelease release:clean
mvn -Prelease release:prepare -Dtag=xxxxx
where xxxxx is 1.0.0-incubating-RC1-test or whatever you want your
tag to
be called.
You will be prompted for the version numbers.
I will redo the tag using this process with 725, and the fixes
mentioned by
Vincent for the project files.
the new tag will be 1.0.0-incubating-RC1-test2, I will try and run
the
release:perform, but as before my connection might be too slow for
this.
Ian
On 16 Dec 2008, at 09:11, Kevin Brown wrote:
On Mon, Dec 15, 2008 at 1:39 PM, Vincent Siveton
<[email protected]>wrote:
FYI I noticed that javadoc files doesn't include NOTICE, DISCLAIMER
and LICENSE. It is due to SHINDIG-725
I can take care of this, but I want to make sure I get it right
since I'm
not that familiar with SVN.
Based on Paul's email (and I assume Paul is familiar with SVN), it
seems
like the right approach is:
- Check into trunk
- Create a new directory and sync from RC branch
- svn merge -r<current rc rev>:<new rev> ...files...
- commit what I have checked out in the RC branch
Is that right?
Cheers,
Vincent
2008/12/15 Vincent Siveton <[email protected]>:
Hi Ian,
2008/12/15 Ian Boston <[email protected]>:
I have done a test RC1 tag, but I appear to be unable to do a
release
perform, as my packet latency to people.apache.org is a bit
high and
lots of
things time out (packet latency between 400 - 4000 ms with some
loss)
FYI if you are in Europe, you could use this svn mirror
http://svn.eu.apache.org/
I don't think we have a mirror for p.a.o.
If you or someone else could do the perform it would be greatly
appreciated.
Done in [1] from the tag. The distribution is in [2]. The
artifacts
are signed with my PGP key.
Note:
- SHINDIG-789 was not applied
- some issues like NOTICE and committers list are always pending
(see
[3])
- needs to rename the tag 1.0.0-incubating-RC1-test
HTH
Cheers,
Vincent
[1] http://people.apache.org/~vsiveton/staging-repo-shindig/<http://people.apache.org/%7Evsiveton/staging-repo-shindig/
>
<http://people.apache.org/%7Evsiveton/staging-repo-shindig/>
[2]
http://people.apache.org/~vsiveton/staging-repo-shindig/org/apache/shindig/shindig/1.0.0-incubating-RC1/
<http://people.apache.org/%7Evsiveton/staging-repo-shindig/org/apache/shindig/shindig/1.0.0-incubating-RC1/
>
<
http://people.apache.org/%7Evsiveton/staging-repo-shindig/org/apache/shindig/shindig/1.0.0-incubating-RC1/
[3]
http://shindig-dev.markmail.org/message/5opadyudl44kdrll?q=json+release
