Difference between branches

[H320]

Hi,

I am currently using the 1.3-stable branch because it has "stable" in it...

But I wonder what are the differences between 1.3-stable and master branch which are the most updated branches of the repository. I ask this question, mostly because some bug fix commits are not merged in 1.3-stable branch.

Which one would you advice ?

Thanks in advance for any response.

[Cas]

It does mention on the wiki that at the moment master branch is for ongoing development. What bug fixes are not in 1.3-stable?

[H320]

By comparing commits listed for master and 1.3-stable I detect those commits that are in master branch but not in 1.3-stable:

http://git.deluge-torrent.org/deluge/co ... 1e754cc3aa
http://git.deluge-torrent.org/deluge/co ... 5d92f0a10e

I don't know if lists should match or not. I just assume that in those two cases bug fixs are only applied to master branch.

[Cas]

The first one is a bug in code applied to master and second one was applied to 1.3-stable, as mentioned in the ticket.

[H320]

Thanks for your answers. I didn't take the time to check the related tickets...

[Cas]

The way it works currently is that we have been fixing issues in 1.3-stable which are then cherry-picked upstream to master. Nearly all commits will be applied but those that are not will normally have details in the relevant bug ticket.