Merging tickets
Mike Hansen
Here is the process I used when merging tickets.
0) I usually do all the work in ~/release/XXX/sage-XXX/devel/sage
1) For a patch I want to merge, I just do "hg qimport
http://trac.sagemath.org/rest/of/url.patch"
2) If it is weirdly name (i.e., doesn't have the trac number on it), I
usually prefix it with trac_YYYY- so I know which ticket it came from.
This is just an "hg qrename name_of_patch"
3) Apply the patch: "hg qpush"
4) Run tests. We'll assume they all patch.
5) Make sure the ticket number is in the commit message with "hg qrefresh -e"
6) Run this command to export all applied patches to the patches/
directory and commit them into the repo:
for n in `hg qap`; do hg export $n > ../../../patches/$n; done && hg qfinish -a
7) Close the ticket: Add the authors, reviewers, and merged in field
so that we can autogenerate the release notes.
I've found that this works pretty efficiently.
--Mike
Nick Alexander
On 7-Jun-09, at 9:48 PM, Mike Hansen wrote:
> Hello,
>
> Here is the process I used when merging tickets.
Thanks Mike. Craig is going to spend some time tomorrow automating
bits of this.
We would like to know how you test on the build farm, and how you
update the web site (email Harald?)
Nick
Mike Hansen
No idea on the website. For the vmware images on boxen, you currently
1) Put a copy of the source tarball in /home/was/farm/src
2) Run /home/was/go. The logfiles will be in /home/was/farm/out
To do the build tests on skynet, you do the same as in step 1 but run
/home/was/farm/go_skynet. Note that these do a full build from
scratch and then run tests.
I hope I got that right.
--Mike
William Stein
And you have to do all of the above as the user "wstein". Also, it
runs "make testlong", I think by default.
For skynet, the logs are in my home directory (on skynet) in ~/build/logs/
William