eric6.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog

Module implementing a dialog to enter the data for a merge operation.

None

Class implementing a dialog to enter the data for a merge operation.

None

SvnMergeDialog

Class implementing a dialog to enter the data for a merge operation.

QDialog, Ui_SvnMergeDialog

None

None

SvnMergeDialog	Constructor
__enableOkButton	Private method used to enable/disable the OK-button.
getParameters	Public method to retrieve the merge data.
on_tag1Combo_editTextChanged	Private slot to handle the tag1Combo editTextChanged signal.
on_tag2Combo_editTextChanged	Private slot to handle the tag2Combo editTextChanged signal.

None

SvnMergeDialog(mergelist1, mergelist2, targetlist, force=False, parent=None)

Constructor

__enableOkButton()

Private method used to enable/disable the OK-button.

getParameters()

Public method to retrieve the merge data.

Returns:: tuple naming two tag names or two revisions, a target and a flag indicating a forced merge (string, string, string, boolean)

on_tag1Combo_editTextChanged(text)

Private slot to handle the tag1Combo editTextChanged signal.

on_tag2Combo_editTextChanged(text)

Private slot to handle the tag2Combo editTextChanged signal.