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 #1955 (closed task: fixed)

Opened 11 years ago

Last modified 10 years ago

Ensure 1.1 changes get applied to 1.5

Reported by: kskuhlman Owned by: kskuhlman
Priority: normal Milestone: 1.5
Component: TurboGears Version: 1.5 HEAD
Severity: normal Keywords:
Cc:

Description

This is a placeholder ticket to track changesets that have been applied to the 1.1 branch, but have not yet been applied/ported to 1.5

Attachments

1.1_vs_1.5.diff Download (71.8 KB) - added by kskuhlman 11 years ago.
Diff of the 1.1 & 1.5 branches as of r5540
11_vs_15_r6555.diff Download (79.5 KB) - added by kskuhlman 10 years ago.
Updated to r6555
11_vs_15_r6939.diff Download (88.6 KB) - added by kskuhlman 10 years ago.

Change History

comment:1 Changed 11 years ago by kskuhlman

These changes need to be merged: r5113, r5156 (partial), r5171, r5172, r5173 (partial), r5174, r5175

comment:2 Changed 11 years ago by kskuhlman

  • Status changed from new to assigned

Merged remaining changes from r5173 in r5179 & r5184.

New list is: r5113, r5156 (partial), r5171, r5172, r5174, r5175

comment:3 Changed 11 years ago by kskuhlman

Merged changes from r5113, r5171, r5172, and r5174 in r5185.

New list is: r5156 (partial), and r5175

comment:4 Changed 11 years ago by faide

  • Milestone changed from 1.6 to 1.5

comment:5 Changed 11 years ago by kskuhlman

Merged some new commits since last note: 5240, 5253, 5263, 5266, 5267, 5269, 5274, 5276, and 5277.

5289 is giving me a hard time (applies cleanly, but 4 tests fail), and still working on 5156 & 5175 from above. Everything else up to 5290 (inclusive) is merged.

comment:6 Changed 11 years ago by kskuhlman

Ported r5289 in r5439, and r5175 in r5440.

Resolving the issues with r5156 is it's own ticket, #1946, so I'll stop referring to that change here.

The 1.5 branch is up to date through r5440

comment:7 Changed 11 years ago by faide

Thx Ken :) That's a nice job you're doing here!

Changed 11 years ago by kskuhlman

Diff of the 1.1 & 1.5 branches as of r5540

comment:8 Changed 11 years ago by kskuhlman

Thanks for the feedback. It's greatly appreciated!

I put some work in to minimize the diffs between the 1.1 & 1.5 branches, and it's now down to less than 400 added/changed lines, plus a couple hundred removed. See attached.

Changed 10 years ago by kskuhlman

Updated to r6555

comment:9 Changed 10 years ago by kskuhlman

1.5 is now up-to-date with all 1.1 changes through r6555.

comment:10 Changed 10 years ago by Chris Arndt

Ken, do you still keep this ticket up-to-date?

Do you merge changes from TG 1.1 strictly in order or is it allowed to merge sth. isolated I need from recent TG 1.1 changes if not all revisions before have been merged?

comment:11 Changed 10 years ago by kskuhlman

Yeah, I intend to keep it up to date. I'm currently a little behind after the run-up to 1.1final, but I should be caught back up again soon.

If you need something in that I haven't gotten to yet, feel free to merge it. I'll see it in the check-in logs & cross it off my list.

Right now we're good through r6658.

comment:12 Changed 10 years ago by kskuhlman

I'm skipping the merge of r6665 for now. The patch applies cleanly, but the www-authenticate test fails.

This is probably related to the hacky solution to #1985 that I used in r5539.

It may be possible to dig out of this situation using cherrypy.tools.basic_auth, but that needs more research.

comment:13 Changed 10 years ago by kskuhlman

Yeah, same thing with r6671. Skipping.

comment:14 Changed 10 years ago by kskuhlman

And r6672 is conflicted until we deal with the above. Skipped for now, too.

comment:15 Changed 10 years ago by kskuhlman

Re-opened #1985 to track the issues merging above revs so that I can focus on getting everything else up to date again.

comment:16 Changed 10 years ago by kskuhlman

I believe we're current as of r6914, but I'm postponing a detailed review of the diffs between 1.1 & 1.5 until #1985 is resolved.

comment:17 Changed 10 years ago by kskuhlman

  • Version set to 1.5 HEAD

Changed 10 years ago by kskuhlman

comment:18 Changed 10 years ago by kskuhlman

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

#1985 is resolved.

Changes are now being applied to 1.5 first & then backported as necessary; this task is no longer needed.

Work has started on 1.5a2, so attaching last diff between 1.1 & 1.5a1 & closing ticket.

Note: See TracTickets for help on using tickets.