Mercurial Repositories > eric / file comparison
comparison: src/eric7/Documentation/Source/eric7.VCS.VersionControl.html
src/eric7/Documentation/Source/eric7.VCS.VersionControl.html
- branch
- eric7
- changeset 10684
- 58c7f23ae1cb
- parent 10493
- f795d68d8e09
- child 11013
- ad483a12058c
equal
deleted
inserted
replaced
| 10683:779cda568acb | 10684:58c7f23ae1cb |
|---|---|
| 474 | 474 |
| 475 <dl> | 475 <dl> |
| 476 | 476 |
| 477 <dt><i>interval</i> (int)</dt> | 477 <dt><i>interval</i> (int)</dt> |
| 478 <dd> | 478 <dd> |
| 479 check interval for the monitor thread in seconds | 479 check interval for the monitor thread in seconds (unused) |
| 480 </dd> | 480 </dd> |
| 481 <dt><i>project</i> (Project)</dt> | 481 <dt><i>project</i> (Project)</dt> |
| 482 <dd> | 482 <dd> |
| 483 reference to the project object | 483 reference to the project object (unused) |
| 484 </dd> | 484 </dd> |
| 485 </dl> | 485 </dl> |
| 486 <dl> | 486 <dl> |
| 487 <dt>Return:</dt> | 487 <dt>Return:</dt> |
| 488 <dd> | 488 <dd> |
| 1766 implemented by a subclass | 1766 implemented by a subclass |
| 1767 </dd> | 1767 </dd> |
| 1768 </dl> | 1768 </dl> |
| 1769 <a NAME="VersionControl.vcsResolved" ID="VersionControl.vcsResolved"></a> | 1769 <a NAME="VersionControl.vcsResolved" ID="VersionControl.vcsResolved"></a> |
| 1770 <h4>VersionControl.vcsResolved</h4> | 1770 <h4>VersionControl.vcsResolved</h4> |
| 1771 <b>vcsResolved</b>(<i>name</i>) | 1771 <b>vcsResolved</b>(<i>_name</i>) |
| 1772 <p> | 1772 <p> |
| 1773 Public method used to resolve conflicts of a file/directory. | 1773 Public method used to resolve conflicts of a file/directory. |
| 1774 </p> | 1774 </p> |
| 1775 | 1775 |
| 1776 <dl> | 1776 <dl> |
| 1777 | 1777 |
| 1778 <dt><i>name</i> (str)</dt> | 1778 <dt><i>_name</i> (str)</dt> |
| 1779 <dd> | 1779 <dd> |
| 1780 file/directory name to be resolved | 1780 file/directory name to be resolved (unused) |
| 1781 </dd> | 1781 </dd> |
| 1782 </dl> | 1782 </dl> |
| 1783 <a NAME="VersionControl.vcsRevert" ID="VersionControl.vcsRevert"></a> | 1783 <a NAME="VersionControl.vcsRevert" ID="VersionControl.vcsRevert"></a> |
| 1784 <h4>VersionControl.vcsRevert</h4> | 1784 <h4>VersionControl.vcsRevert</h4> |
| 1785 <b>vcsRevert</b>(<i>name</i>) | 1785 <b>vcsRevert</b>(<i>name</i>) |
