Mercurial Repositories > eric / file comparison
comparison: Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.html
Documentation/Source/eric5.Plugins.VcsPlugins.vcsPySvn.SvnMergeDialog.html
- branch
- 5_1_x
- changeset 1278
- fb0460fd00b9
- parent 440
- 69ace3e2dcf6
equal
deleted
inserted
replaced
| 1277:52dd5a2f1ed1 | 1278:fb0460fd00b9 |
|---|---|
| 49 QDialog, Ui_SvnMergeDialog | 49 QDialog, Ui_SvnMergeDialog |
| 50 <h3>Class Attributes</h3> | 50 <h3>Class Attributes</h3> |
| 51 <table> | 51 <table> |
| 52 <tr><td>None</td></tr> | 52 <tr><td>None</td></tr> |
| 53 </table> | 53 </table> |
| 54 <h3>Class Methods</h3> | |
| 55 <table> | |
| 56 <tr><td>None</td></tr> | |
| 57 </table> | |
| 54 <h3>Methods</h3> | 58 <h3>Methods</h3> |
| 55 <table> | 59 <table> |
| 56 <tr> | 60 <tr> |
| 57 <td><a href="#SvnMergeDialog.__init__">SvnMergeDialog</a></td> | 61 <td><a href="#SvnMergeDialog.__init__">SvnMergeDialog</a></td> |
| 58 <td>Constructor</td> | 62 <td>Constructor</td> |
| 67 <td>Private slot to handle the tag1Combo editTextChanged signal.</td> | 71 <td>Private slot to handle the tag1Combo editTextChanged signal.</td> |
| 68 </tr><tr> | 72 </tr><tr> |
| 69 <td><a href="#SvnMergeDialog.on_tag2Combo_editTextChanged">on_tag2Combo_editTextChanged</a></td> | 73 <td><a href="#SvnMergeDialog.on_tag2Combo_editTextChanged">on_tag2Combo_editTextChanged</a></td> |
| 70 <td>Private slot to handle the tag2Combo editTextChanged signal.</td> | 74 <td>Private slot to handle the tag2Combo editTextChanged signal.</td> |
| 71 </tr> | 75 </tr> |
| 76 </table> | |
| 77 <h3>Static Methods</h3> | |
| 78 <table> | |
| 79 <tr><td>None</td></tr> | |
| 72 </table> | 80 </table> |
| 73 <a NAME="SvnMergeDialog.__init__" ID="SvnMergeDialog.__init__"></a> | 81 <a NAME="SvnMergeDialog.__init__" ID="SvnMergeDialog.__init__"></a> |
| 74 <h4>SvnMergeDialog (Constructor)</h4> | 82 <h4>SvnMergeDialog (Constructor)</h4> |
| 75 <b>SvnMergeDialog</b>(<i>mergelist1, mergelist2, targetlist, force = False, parent = None</i>) | 83 <b>SvnMergeDialog</b>(<i>mergelist1, mergelist2, targetlist, force = False, parent = None</i>) |
| 76 <p> | 84 <p> |
