Note that there are some explanatory texts on larger screens.

plurals
  1. PO
    primarykey
    data
    text
    <p>Examine the first screen shot and see that the top line says <code>8+</code> in the <code>Rev</code> column. This means that your working copy is based off revision 8. You can follow the line down and also see that it joins at revision 8 which indicates the same thing.</p> <p>There are two ways to solve this depending upon whether you have made any changes or not.</p> <ul> <li><p>If you have not made any changes then you would right click on revision 13 and select <strong>Update...</strong>. to update to the latest change.</p></li> <li><p>If you have made changes then you need to commit those changes and then right click on revision 13 and select <strong>Merge with local...</strong> which brings up a wizard to handle the merge.</p></li> </ul> <p>In your last screenshot it seems like you've not got a working copy at all so you need to use the update procedure above to update to revision 13.</p> <p>You can have the <code>update</code> happen automatically by changing a setting in TortoiseHg:</p> <ol> <li>Select <strong>File</strong> > <strong>Settings</strong> from the <code>Workbench</code></li> <li>Choose where you want to make the setting change by selecting the appropriate tab at the top. The choices are global to the user or just for this repository</li> <li>Select <strong>Workbench</strong> in the left list</li> <li>In the section on the right, look for a drop down list labeled <strong>After Pull Operation</strong></li> <li>Select <strong>update</strong> from the list</li> </ol> <p>This will do an update to latest every time you do a pull which will avoid the problem in your first screenshot. You will still have to do a manual merge when you and another developer have made changes.</p> <p>The other options in that list are <code>rebase</code> and <code>fetch</code> which both rely on the appropriate extension being enabled and are for advanced use only. </p>
    singulars
    1. This table or related slice is empty.
    plurals
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. This table or related slice is empty.
    1. VO
      singulars
      1. This table or related slice is empty.
    2. VO
      singulars
      1. This table or related slice is empty.
    3. VO
      singulars
      1. This table or related slice is empty.
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload