Mercurial Repositories > eric / file comparison
comparison: Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html
Documentation/Source/eric5.Plugins.VcsPlugins.vcsMercurial.ProjectHelper.html
- changeset 305
- 5cf9e308f342
- parent 278
- c93823b96faa
- child 409
- 0ea528e80202
equal
deleted
inserted
replaced
| 304:98429932e0c9 | 305:5cf9e308f342 |
|---|---|
| 136 <td>Protected slot used to recover from an interrupted transaction.</td> | 136 <td>Protected slot used to recover from an interrupted transaction.</td> |
| 137 </tr><tr> | 137 </tr><tr> |
| 138 <td><a href="#HgProjectHelper.__hgResolve">__hgResolve</a></td> | 138 <td><a href="#HgProjectHelper.__hgResolve">__hgResolve</a></td> |
| 139 <td>Private slot used to resolve conflicts of the local project.</td> | 139 <td>Private slot used to resolve conflicts of the local project.</td> |
| 140 </tr><tr> | 140 </tr><tr> |
| 141 <td><a href="#HgProjectHelper.__hgServe">__hgServe</a></td> | |
| 142 <td>Protected slot used to serve the project.</td> | |
| 143 </tr><tr> | |
| 141 <td><a href="#HgProjectHelper.__hgShowBranch">__hgShowBranch</a></td> | 144 <td><a href="#HgProjectHelper.__hgShowBranch">__hgShowBranch</a></td> |
| 142 <td>Private slot used to show the current branch for the project.</td> | 145 <td>Private slot used to show the current branch for the project.</td> |
| 143 </tr><tr> | 146 </tr><tr> |
| 144 <td><a href="#HgProjectHelper.__hgShowConfig">__hgShowConfig</a></td> | 147 <td><a href="#HgProjectHelper.__hgShowConfig">__hgShowConfig</a></td> |
| 145 <td>Protected slot used to show the combined config.</td> | 148 <td>Protected slot used to show the combined config.</td> |
| 322 </p><a NAME="HgProjectHelper.__hgResolve" ID="HgProjectHelper.__hgResolve"></a> | 325 </p><a NAME="HgProjectHelper.__hgResolve" ID="HgProjectHelper.__hgResolve"></a> |
| 323 <h4>HgProjectHelper.__hgResolve</h4> | 326 <h4>HgProjectHelper.__hgResolve</h4> |
| 324 <b>__hgResolve</b>(<i></i>) | 327 <b>__hgResolve</b>(<i></i>) |
| 325 <p> | 328 <p> |
| 326 Private slot used to resolve conflicts of the local project. | 329 Private slot used to resolve conflicts of the local project. |
| 330 </p><a NAME="HgProjectHelper.__hgServe" ID="HgProjectHelper.__hgServe"></a> | |
| 331 <h4>HgProjectHelper.__hgServe</h4> | |
| 332 <b>__hgServe</b>(<i></i>) | |
| 333 <p> | |
| 334 Protected slot used to serve the project. | |
| 327 </p><a NAME="HgProjectHelper.__hgShowBranch" ID="HgProjectHelper.__hgShowBranch"></a> | 335 </p><a NAME="HgProjectHelper.__hgShowBranch" ID="HgProjectHelper.__hgShowBranch"></a> |
| 328 <h4>HgProjectHelper.__hgShowBranch</h4> | 336 <h4>HgProjectHelper.__hgShowBranch</h4> |
| 329 <b>__hgShowBranch</b>(<i></i>) | 337 <b>__hgShowBranch</b>(<i></i>) |
| 330 <p> | 338 <p> |
| 331 Private slot used to show the current branch for the project. | 339 Private slot used to show the current branch for the project. |
