MPS 2017.1 Help

Checking In Files

Basics

Different version control systems have different semantics for the action of uploading changed files to the repository. Two common terms are check in and commit.

In those version control systems, for example, Git, that distinguish between local and remote repositories, the term commit denotes uploading changes to a local repository. Uploading changes to a remote repository is referred to as push.

Regardless of the terminology, you can perform this operation with the VCS configured for a directory from within MPS.

Checking changed files in

To check in (commit) changed files, perform these general steps

In the Version Control tool window, select one or more files you want to check in (commit) to version control.

To expand or narrow the context of an updated code fragment, position the cursor at the change in question, click the More/Less Lines button , and then specify the number of lines to be shown above and below the current code fragment.

Add a commit comment. As you type, MPS checks the spelling and highlights words in question, provided thatthe Spelling code inspection is enabled.

Specify which actions should be performed on the files before and after submitting them to the repository.

Click the Submit/Commit button to launch the Check-in Changes operations.

For Git and Mercurial. To have the changes immediately pushed to your Git or Mercurial repository, do one of the following:

Hover the mouse pointer over the Submit/Commit button and select Commit and Push on the context menu.

From the Submit/Commit drop-down list, select Commit and Push.

To save the changes as a patch in a text file, hover the mouse pointer over the Submit/Commit button and select Create Patch on the context menu.

Alternatively, use the Submit/Commit drop-down list to select the Create Patch item.

If any error occurs when trying to commit, MPS displays an error message. For example, you might have changed a file that has been already edited by another team member, or you might run into a branch conflict. In these cases, you need to merge edits, or update your local copy. The error messages are VCS-specific.

Users of JetBrains TeamCity can obtain the TeamCity plugin for MPS. Among the features of this plugin is Remote Run, which enables you to create a special personal build that does not affect the real build. Your changes are built and run through your test suite. If all tests are passed, your changes are automatically committed to version control.