Force update when local branch is ahead

[fernandog]

@pymedusa/developers

we recently had to remove one commit from develop which caused a "Local branch is ahead of develop. Automatic update not possible" to develop users

this will affect only develop and master branches.

[ratoaq2]

Is there a reason to have it only for master and develop?

[fernandog]

@ratoaq2 if someone is using a testing branch or working on another branch and haven't pushed yet, he will lose the commits if this force updated it not only for develop|master

[ratoaq2]

Valid scenario. But there's another valid one:

• 1 'production' installation running a specific branch other than master or develop (for testing purposes, most of the time)
• 1 local dev environment

The local dev environment should never reset and force update, but the 'production' installation should.

[fernandog]

@ratoaq2 can you test please?

[coveralls]

Coverage increased (+0.004%) to 28.878% when pulling 21df105 on fix_update into ccc5f4e on develop.

[ratoaq2]

If there's no branches in the list, it should accept as well

or (sickbeard.GIT_RESET and (not sickbeard.GIT_RESET_BRANCHES or sickbeard.BRANCH in sickbeard.GIT_RESET_BRANCHES)) 

The same logic some lines below (probably a function would fit: def should_reset)

[fernandog]

@ratoaq2 Did you try the Ui? Use must select branches in a pre-populated select

[coveralls]

Coverage decreased (-0.001%) to 28.88% when pulling d4ea5af9171746e78121850eb79e20af260d0c97 on fix_update into 73678cd on develop.

[coveralls]

Coverage decreased (-0.001%) to 28.88% when pulling d4ea5af9171746e78121850eb79e20af260d0c97 on fix_update into 73678cd on develop.

[coveralls]

Coverage decreased (-0.001%) to 28.88% when pulling 136531050014412618012e23ea8549bd09a9cb07 on fix_update into 73678cd on develop.

[coveralls]

Coverage decreased (-0.008%) to 28.873% when pulling 5998b82aa05442c0f397a60c4851b0c2b4086c83 on fix_update into 73678cd on develop.

[coveralls]

Coverage decreased (-0.008%) to 28.873% when pulling a11b790be9df04a074203b6fc024d6c32322622f on fix_update into 73678cd on develop.

[ratoaq2]

Approved

[coveralls]

Coverage decreased (-0.001%) to 28.88% when pulling 67f260b on fix_update into f90f3d3 on develop.