Red cross : indicates that the corresponding file or folder is scheduled to be deleted deleted , or that the file is missing. Gray line : indicates that it is not subject to version control and ignores version control. Blue question mark : No version control has been received yet, but it has not been ignored.
Lock : indicates that the file is locked, and his Subversion status is normal, and the lock must be released before others can commit changes. The SVN icon cannot be displayed normally. Problem analysis: 1. Use the SVN plug-in as the version controllerin Myeclipse or Eclipse , which has been used normally for a long time. But suddenly for a day,the version numberof the files under the project and the prompt icon are gone. After checking, the SVN is normal. At the beginning,deletethe.
But they can't solve the problem. Later, the repair function of the installation file solved the problem, that is, double-click the installation file, select repair, and then restart the system. This seems to be a common problem after SVN update. View Image -Version controlled files have been ignored. A file ignored by version control. View Image - Documents that are not included in version control are generally new documents that have not been submitted A file not under version control.
These are typically new files that you have not committed to the repository yet. View Image -locally rename or move files to other directories. 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. View Image -Locally deleted directory. 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. Item is being ignored e. Item is missing e. This also indicates that a directory is incomplete a checkout or update was interrupted.
Item is versioned as one kind of object file, directory, link , but has been replaced by a different kind of object. Properties for this item are in conflict with property updates received from the repository.
When --show-updates -u is used, this means the file is not locked. If --show-updates -u is not used, this merely means that the file is not locked in this working copy.
File is locked either by another user or in another working copy. This appears only when --show-updates -u is used.
The blue arrow pointing to the left with a plus sign in the middle the SVN has more files than the local one. After deleting the file, update it again to update all the files on the svn. Red two-way arrow files modified on SVN and locally modified This means that both local and svn have been modified. It is best to merge local modifications into svn and update the code last. Red exclamation mark the local code is not consistent with the library : This means that the local code is not consistent with the library.
The Altium Designer project, which is now fully under Git version control, becomes available to other users from the remote Git repository. Another user may clone the repository to their local machine, for example, and ultimately push their edited files back to the remote repository in a collaborative workflow.
When a project has been added to version control, its local working project folder is now linked to its counterpart in the VCS repository, as indicated by the link icon associated with the project folder entries in the Storage Manager panel. To confirm the locations of the linked folder and repository, right-click on any file entry in the panel and select the VCS Properties option not available when using Git.
The following Properties dialog includes the paths of the linked locations and information on the latest VCS revision. File indcated by link icon and the cooresponding Properties panel that contains information on the latest VCS revision. As a result of the registered VCS link, the version control system can monitor and detect any differences between files in the local project folder and their equivalents in the VCS repository folder.
When a difference is detected, such as when a design file has been edited and saved in Altium Designer, the version control system will change the status of the local file to Modified and Altium Designer will offer an appropriate set of VCS commands on the right-click menu in the panels. After a project document file has been edited and saved in Altium Designer it is flagged as Modified , and indicated as such in both the Projects and Storage Manager panels.
To commit those changes as a new revision in the VCS, right-click on the file entry in the panel and select the Commit command from the context menu. The Commit Whole Project command could also be used, which will commit all modified files in the project,. The Commit command. View the Storage Manager panel to see the sequence of actions in the VCS Revisions section, which will include the creation of a new VCS revision with an incremented revision number for that file — in this case, Revision 3 and its added comment.
The icon indicates the latest and the current revision of the selected file, or in version control terms, the Head revision. For a combined view of both revision and history event entries, change to the single Timeline view by selecting Switch to Combined View from the right-click context menu.
As outlined above, a local project that has been added to Version Control can be edited by Altium Designer from the project's local folder, and the changes are then updated to the VCS repository. The local folder and the repository folder are linked and ultimately synchronized by the VCS.
Another user, who will not have access to the project from its source folder which is local to your PC , can use the Check Out process to obtain their own copy of the files from the SVN repository that hosts the project. All users that wish to collaborate on the project design will need to connect to that common or 'centralized' SVN design repository, which is typically arranged to be accessible via the local network or from a server. Use the following Check Out dialog to select the desired repository from the drop-down menu, or use the button to establish a new repository connection in the Data Management — Design Repositories page of the Preferences dialog.
The Check out to option can be edited to override the path established in the initial repository connection setup. Checking a project out from a repository. The selected repository project folder and its constituent files will be checked out to the specified local folder and opened in Altium Designer.
Note that the local folder is that defined as a checkout folder for the selected repository, and the checked out project is subsequently linked to its counterpart in the SVN repository. The VCS link instructs the version control system to monitor and detect any differences between the files in the local checkout folder and their equivalents in the VCS repository folder.
Commit the changes when the file edits are complete, which will synchronize the files in the design repository to match those in the checkout folder, creating a new VCS revision. When a local project has been added to version control there are in fact two ways that it can be edited and updated to VCS:.
The local project is the source, or origin, of the VCS project that is being shared with other users. Depending on how you would like to work, this local source version could be removed or locked as an archived project source, and the Check Out approach then used to make further edits. Or indeed, you could continue to open and work on the project files from the local 'source' folder Open Project.
The best approach is to stick to one method Check Out is recommended , since the two options deal with a working folder in different locations — the local source project folder, or in the nominated VCS checkout folder. Conversely, if both methods are used there will be multiple, active copies of the same project on the local PC.
If these versions are dutifully Committed to the centralized VCS repository after each edit, however, the repository will always hold the latest revision of the project, as intended. When the project is not available locally, as is the case for another user, the only choice is to Check Out the project from the VCS repository. See below for the equivalent process when using Git VCS.
Also note that once a project has been initially checked out from the VCS repository, it then exists locally and can be reopened directly from the checkout folder File » Open Project. In this case there is again the choice of checking out a project from the VCS File » Check Out or opening the local version Open Project , however, there is only ever one local copy. In practical VCS terms the two methods are very similar, but will behave differently in some circumstances — such as when a local file is missing, where it will be restored by the Check Out command, but it will be removed from the Project by an Open Project command.
A local project that has been added to Git Version Control can be edited by Altium Designer from the project's local folder the working repository , and the committed changes are then updated to the remote Git repository. The local repository and the remote repository are linked and ultimately synchronized by a VCS Push command.
Other users who wish to collaborate on the design can access the project by cloning the remote Git repository to a local working repository.
While the approach to accessing files from a remote Git repository will differ with company systems and methods, a basic way to clone the content from a remote repository to a local working repository is by using the Git command; git clone [remote repository URL] [target working repository folder] , as shown in the below image. Committed changes updated to the remote Git repository. The process will replicate the shared remote repository as a local working repository and automatically check out the latest HEAD revision from the master branch.
The files may then be edited, saved, and committed to VCS in Altium Designer, and ultimately pushed back to the remote Git repository. During the course of working with design documents in Altium Designer that are under Version Control, design files that have been accessed from the central shared VCS repository will represent the latest revision of those files.
When the local edits are complete and have been committed or with Git; pushed back to the shared VCS repository, these file versions then become the latest revisions. As such, the normal sequence of check out, edit, save and commit and Push, with Git progressively adds new file revisions to the central VCS as the project design is developed.
0コメント