Angband.oook.cz
Angband.oook.cz
AboutVariantsLadderForumCompetitionComicScreenshotsFunniesLinks

Go Back   Angband Forums > Angband > Vanilla

Reply
 
Thread Tools Display Modes
Old July 14, 2007, 04:39   #1
ctate
Rookie
 
Join Date: Jul 2007
Posts: 18
ctate is on a distinguished road
Angband source branches vs trac

I'm a bit confused about bugs filed in trac and how the Angband source branches relate to them. In particular, I see that there was a bug recently [#231] marked 'fixed' in what appears to be some sort of 3.0.8 post-release maintenance branch, but not fixed in the main trunk. Trac unfortunately does not seem to support associating bugs with particular code branches, or (ideally) maintaining multiple branches of any ticket.

How can I tell where a given ticket got fixed, and what's the process for making sure that a bug fix in a maintenance branch gets propagated to the trunk?

--
ctate
ctate is offline   Reply With Quote
Old July 14, 2007, 12:43   #2
ajps
Apprentice
 
Join Date: May 2007
Location: Manchester, UK
Posts: 50
ajps is on a distinguished road
Quote:
Originally Posted by ctate View Post
How can I tell where a given ticket got fixed, and what's the process for making sure that a bug fix in a maintenance branch gets propagated to the trunk?
As I understand it (and why I've been fixing and closing bugs as I have) all bugfixes for the 3.0.8fix1 release are being made in the 3.0.8 branch, and will then be merged back into the trunk when that release is made. That will bring the two back into sync, and hopefully mark the end of the 3.0.8 branch altogether as it should then be free of major bugs.

As to how you can tell where it was fixed, when I close bugs I try to remember to put a comment on them saying which set of changes fixed them, such as "Fixed in [335]." which gives you an easy link to the changeset. Likewise, in the comments for commits I try to put "Closes #231" so that you can find which bugs a change was supposed to fix when you're looking at it. I think everyone else does the same where changes actually relate directly to a bug/ticket, but equally, I'm sure we forget sometimes.
ajps is offline   Reply With Quote
Reply


Currently Active Users Viewing This Thread: 1 (0 members and 1 guests)
 
Thread Tools
Display Modes

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off

Forum Jump


All times are GMT +1. The time now is 13:11.


Powered by vBulletin® Version 3.8.11
Copyright ©2000 - 2019, vBulletin Solutions Inc.