On May 20, 2010, at 12:06 PM, Kalle Korhonen wrote:

> On Thu, May 20, 2010 at 12:00 PM, Les Hazlewood <[email protected]> wrote:
>> Yeah, I can fix it rather quickly I think.  Can you do the rollback
>> while I fix it and write the test case? Also, I'm assuming I can add
>> the fix to trunk?
> 
> Yeah, I'll rollback and drop the staged release. You can fix it in the
> trunk, but the fix needs to be merged to the shiro-root-0.0.x branch
> (hey you asked for it :)

FYI, since you just you two guys fiddling around with things at the moment, 
it's ok to trash the branch and tags.

But you are correct, normally you would merge the fix into the branch and trunk.


Regards,
Alan

Reply via email to