Warning: Can't synchronize with repository "(default)" (Unsupported version control system "svn": No module named svn). Look in the Trac log for more information.

Ticket #1703 (closed task: fixed)

Opened 11 years ago

Last modified 11 years ago

Merge changes from 1.0 to 1.1

Reported by: chrisz Owned by: anonymous
Priority: high Milestone: 1.5
Component: TurboGears Version: 1.1 HEAD
Severity: critical Keywords:
Cc:

Description

After the 1.0.4 release and the feature freeze in 1.0, we need to merge all changes from the 1.0 branch into the 1.1 branch.

After going through all the changes and merging most of the remaining things (these were less than I thought), only the following changes remain to be merged:

Let's get them in quickly, so we can start working on TG 1.1. I also suggest creating an alpha release of TG 1.1 when all changes are in the unit tests are working again.

Change History

comment:1 Changed 11 years ago by chrisz

I think I have now merged all of the above (everything up to r4066). But some new changes have been made to the 1.0 branch which need to be merged again.

comment:2 Changed 11 years ago by chrisz

  • Status changed from new to closed
  • Resolution set to fixed

Merged all remaining changesets up to the current r4182.

All unit tests are now running again in the 1.1 branch with Py 2.4 and 2.5 (Py 2.3 is not supported any more).

comment:3 Changed 11 years ago by Chris Arndt

  • Version changed from 1.1b1 to 1.1 HEAD
Note: See TracTickets for help on using tickets.