As there are a lot of big changes coming up like the decoupling of the UI I was planning to make a special v0.972 branch so we can do an intermediate release as we don't have to wait until everything works again.

We'll branch of at this point in time as the trunk is almost the same as for the 0.971 release and merge small changes to this branch. What we especially would like to fix is to limit the number of fakes ted is finding at the moment. One way to do this, and Webruss is working on this, is to take the release time into account. (Other suggestions are welcome)

We can then easily do a new release from this branch and you guys can keep continuing feasting on the trunk

Sounds like a plan?

Sure, that would work for me. You could branch either what we have today, or the 0.971. The main thing I'd like to make sure we avoid, is changes made to the branch that are never ported forward. We'll just have to be careful.

Also, I don't plan to make any changes that will at any point leave us without a working copy of the jar, but of course it could be less stable as it's less tested.

Mstead and I talked for a while on how best to handle the layout of the project for adding a web interface. I was hoping to keep our current layout, but it seems that may make development more difficult (due to how gwt generates javascript, etc).

Instead I think we'll move towards 3 separate sub-projects: ted-core, ted-swing, ted-gwt. To start with we'll just move the whole project into a ted-core subproject.

So after you branch I'll make that change. It'll move our /src to a ted-core/src, so unfortunately moves all the files (again). Maven will be setup to handle this layout, so building should still be as easy as 'mvn package'.

You can make the change whenever you like. We can always branch of a specific revision of the trunk. The sooner the better though Unfortunately, I don't really have time for it now.

Okay, I created the 0.972 branch. If anybody thinks his bug fix has to be merged there please let me know.

Hey'a b'ye,

Just testing a few changes in trunk/ and I noticed I keep seeing the 'upgrade' warning, and don't get torrents in that branch.

Upon further investigation I notice there's 21 commits in the ted0972 branch that don't appear merged forward into trunk.

Would you like to merge them in? If you don't time I can walk through them and pull them in.

I want to make sure we don't leave any changes behind and have them lost.

You're right, we should have done this already. I hope to have time for it coming weekend. If you want to do this sooner go ahead, it's not like I'm looking forward to do this

But the general rule should be that all work should be done on the main branch and then be merged to the 0.972 branch (or 0.9715 for that matter). Unfortunately for some changes the differences between both branches are just too big that a different fix is justified for different branches.

Having said that I'm probably the one who violated this rule the most

Sounds good.

I'm not sure if I'll have time before the weekend, but if so I may try merge them in. Maybe I'll create a quick wiki page for them.

I agree about keeping work in the main branch. I've seen work diverge on branches and become impossible to merge too many times .

Added this wiki page for tracking them:

https://ted.nu/wiki/index.php/Trunk_merge

Thanks, that is a useful overview of what is to be done!

Okay, I did some of them. Will continue it tomorrow. At least downloading torrents with the 0.972 and core version should work now!

Also got rid of the update notifications by upgrading the version number.

I did most of them, only 2 are remaining. One is quite nasty as it uses TedXmlParser and that class is gone on the core branch so I've to see what to do there. The other one is dependent on the first one.

Note that I had to comment out one line of code in the SeasonEpisodeScheduler: TvRage.parseTvRageShowInfo(serie);
This can be undone after the other two changesets are merged.

I hope all still works You might see some weird behavior the scheduler (one day off) but this is also present on the 0.972 branch. I still decided to merge the changes and when the fix is ready to merge that again.

Awesome. Thank you. I'll try it out and see how it all works.

Any updates?