StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

PO
text
Body
copied!<p>When working with the Subversion repository, remote changes (those on the repository) are incoming changes (remote → local), while local changes are outgoing changes (local → remote).</p> <p>In views that compare the local and remote copies, incoming changes are denoted with a blue, left-facing arrow, while outgoing changes are denoted with a gray, right-facing arrow. These arrows may be decorated to indicate more specific operations.</p> <p>The Package Explorer view, on the other hand, indicates a file's status with a different set of icons representing its local state. These icons are the ones most commonly seen, so let's start with them:</p> <p><sub><img src="https://i.stack.imgur.com/uKpNO.png" alt="Ignored File"></sub> - A file ignored by version control. You can control what resources will be ignored by going to <em>Window → Preferences → Team → Ignored Resources</em>.<br> <sub><img src="https://i.stack.imgur.com/UWf9X.png" alt="Unversioned File"></sub> - A file not under version control. These are typically new files that you have not committed to the repository yet.<br> <sub><img src="https://i.stack.imgur.com/RMTXE.png" alt="New File"></sub> - A versioned file that needs to be added to the remote repository. These are typically files you have either renamed, or moved to a different directory.<br> <sub><img src="https://i.stack.imgur.com/NS1OG.png" alt="Deleted File"></sub> - A deleted folder. These are folders that you have deleted locally without yet committing the changes to the repository. Note that files are usually removed from the view when they're deleted locally, so they are normally not seen with this icon.<br> <sub><img src="https://i.stack.imgur.com/iee2g.png" alt="Synchronized File"></sub> - A file with no local changes.<br> <sub><img src="https://i.stack.imgur.com/jS8wu.png" alt="Local Changes"></sub> - A file with local, uncommitted changes.<br> <sub><img src="https://i.stack.imgur.com/kioVk.png" alt="Locked File"></sub> - A <a href="http://svnbook.red-bean.com/en/1.5/svn.advanced.locking.html" rel="noreferrer">locked</a> file.<br> <sub><img src="https://i.stack.imgur.com/x6p5N.png" alt="Needs Lock"></sub> - A file that needs a lock to be edited. These are typically files that cannot easily be merged (i.e. binary files), but may have many editors. A file needs a lock when its <code>svn:needs-lock</code> property is set, and Subversion will attempt to make these files read-only in the file system to enforce proper lock negotation.<br> <sub><img src="https://i.stack.imgur.com/HyV5B.png" alt="Conflicted File"></sub> - A conflicted file. These are typically files that had a commit/update conflict that you marked to resolve later.<br> <sub><img src="https://i.stack.imgur.com/m3v8P.png" alt="Tree Conflicted File"></sub> - A file that has a tree conflict. These are typically files that have local changes, but have since been moved, removed, or renamed in the repository since the last local copy update.<br> <sub><img src="https://i.stack.imgur.com/tIRZZ.png" alt="External File"></sub> - A file that is external to the project. Linked external files cannot be committed to the repository.<br> <sub><img src="https://i.stack.imgur.com/QhHYs.png" alt="Switched File"></sub> <sub><img src="https://i.stack.imgur.com/K4NCr.jpg" alt="Switched File 2"></sub> - A file that has been <a href="http://svn.haxx.se/subusers/archive-2007-06/0052.shtml" rel="noreferrer">switched</a>. These are files which belongs to a different working copy than their local parent directory.</p> <p>In a synchronization view (e.g. via <em>Synchronize with Repository</em> or <em>Commit</em>), as previously described, there are icons which indicate which direction a change is occurring in as well as additional information about that change. These are described below:</p> <p><strong>Outgoing</strong><br> <sub><img src="https://i.stack.imgur.com/BGt41.png" alt="Commit Changes"></sub> - A file whose contents have been modified and will be committed to the repository.<br> <sub><img src="https://i.stack.imgur.com/RO2hZ.png" alt="Commit Addition"></sub> - A file that will be newly added to the repository. This may coincide with a file removal in cases where a file is moved or renamed..<br> <sub><img src="https://i.stack.imgur.com/01aZm.png" alt="Commit Removal"></sub> - A file that will be removed from the repository. This may coincide with a file addition in cases where a file is moved or renamed.<br> <sub><img src="https://i.stack.imgur.com/CeV6D.png" alt="Property Change"></sub> - A file with <a href="http://svnbook.red-bean.com/nightly/en/svn.advanced.props.html" rel="noreferrer">property changes</a>, in the Commit dialog. On the Synchronize tab, property changes are currently reflected as a normal file modification (<sub><img src="https://i.stack.imgur.com/BGt41.png" alt="Commit Changes"></sub>).</p> <p><strong>Incoming</strong><br> <sub><img src="https://i.stack.imgur.com/3XXOX.png" alt="Remote Changes"></sub> - A file that has content changes committed to the repository that will be applied to the local copy.<br> <sub><img src="https://i.stack.imgur.com/PVH4L.png" alt="Pull Addition"></sub> - A new file that will be added to the local copy from the repository. Like the outgoing file addition, this may be the result of a move or rename.<br> <sub><img src="https://i.stack.imgur.com/OJme5.png" alt="Pull Removal"></sub> - A file that will be removed from the local copy because it has been removed from the repository. Like the outgoing file removal, this may be the result of a move or rename.</p> <p><strong>Conflict</strong><br> <sub><img src="https://i.stack.imgur.com/9wrQQ.png" alt="Conflicting Versions"></sub> - A file that has been changed in both the local copy and repository independently, causing a need for conflict resolution. Fixing this condition involves opening up the conflict view or forcibly overwriting changes locally or remotely.<br> <sub><img src="https://i.stack.imgur.com/KwULa.png" alt="Synchronization Tree Conflict"></sub> - A file that has a <a href="http://svnbook.red-bean.com/nightly/en/svn.tour.treeconflicts.html" rel="noreferrer">tree conflict</a>. This can occur when there are new changes to a file on one end (either local or remote), and the file is moved, removed, or renamed on the other. </p> <p>Finally, the <em>Synchronize with Repository</em> option opens the Synchronize tab (<sub><img src="https://i.stack.imgur.com/lPBhk.png" alt="Synchronize Tab"></sub>) with the following buttons:</p> <p><sub><img src="https://i.stack.imgur.com/zY07z.png" alt="Synchronize Source"></sub> - Synchronizes the local copy with the currently selected repository when clicked. Selecting from the drop-down allows switching between different remote code bases.<br> <sub><img src="https://i.stack.imgur.com/Inal5.png" alt="Show Incoming"></sub> - Shows only incoming changes (remote → local).<br> <sub><img src="https://i.stack.imgur.com/PKM5L.png" alt="Show Outgoing"></sub> - Shows only outgoing changes (local → remote).<br> <sub><img src="https://i.stack.imgur.com/bdp8P.png" alt="Show Incoming and Outgoing"></sub> - Shows both incoming and outgoing changes (remote ↔ local).<br> <sub><img src="https://i.stack.imgur.com/EyWVU.png" alt="Show Conflicts"></sub> - Shows conflicting changes.<br> <sub><img src="https://i.stack.imgur.com/brjg1.png" alt="Update Incoming"></sub> - Updates all local resources with incoming changes after prompt.<br> <sub><img src="https://i.stack.imgur.com/e42Oa.png" alt="Commit Outgoing"></sub> - Brings up the commit dialog to commit all outgoing changes.<br> <sub><img src="https://i.stack.imgur.com/nhsqV.png" alt="Show Changesets"></sub> - Breaks up the change lists by revisions.</p> <p>There are a few other views which weren't covered that have additional icons, but this should hopefully be a good start. Let me know if there is anything important missing, or any of these descriptions seem to differ from your actual experience.</p>

Querying!

Guidance

An individual column

Larger individual text columns get their own page to allow for proper reading.

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