GIT

Aus expecco Wiki (Version 2.x)
Version vom 15. Juli 2019, 15:35 Uhr von Alkurz (Diskussion | Beiträge) (git-plugin for expecco)
(Unterschied) ← Nächstältere Version | Aktuelle Version (Unterschied) | Nächstjüngere Version → (Unterschied)
Zur Navigation springen Zur Suche springen

Preconditions[Bearbeiten]

The plugin provides git-functionality for testsuites.

For proper work you need a remote-repository and access to it without entering user name and password.

Initialization[Bearbeiten]

Configuration[Bearbeiten]

With Git - Administration - Config you can set the global git parameters for user name and mail-address.

Get the local git repository[Bearbeiten]

Provide the functionality of 'git clone': Cloning a repository into a a new local directory. A dialog asks for the url of the remote repository.

Workflow[Bearbeiten]

Add[Bearbeiten]

Before you can commit your new or changed testsuite, you have add the file to the git index with the Add-command. It executes git add <testsuite-file>.

Commit[Bearbeiten]

The added files you can commit to your local branch by using the Commit...-command. A message-box will appear to enter the commit-message. An empty commit-message is not allowed.

  • Add and commit...
    Combines the add- and commit-command.
  • Commit (amend)
    Replace the tip of the current branch by creating a new commit. The new commit has the same parents and author as the current one.
    You should understand the implications of rewriting history if you amend a commit that has already been published!

Push[Bearbeiten]

To publish your test-suite to the remote-repository you have to push it.

Pull[Bearbeiten]

Incorporates changes from the remote repository into the current branch.

Fetch[Bearbeiten]

Downloads objects and refs from the remote repository, but don't change the local files files.

Checkout branch...[Bearbeiten]

To change your working branch, use the Checkout branch...-command. In a dialog you can choose you desired branch.

Comparing and merging[Bearbeiten]

You can compare and merge your testsuite in three different kinds.

In every case the Expecco-ProjectDifferenceBrowser will open. After merging you have to save, add and commit your testsuite (and then push).

Merge with HEAD of the current branch[Bearbeiten]

To update your file and take over the changes done by others use Merge into newest branch

Merge your testsuite-content into another branch =[Bearbeiten]

Checks out the branch you select in a Dialog and merges your testsuite content into the newest version of the selected branch.

Update your testsuite-content with another branch[Bearbeiten]

Updates your testsuite-file with the content of the newest version of the branch you can select in a dialog.


Status dialogs[Bearbeiten]

Show Log[Bearbeiten]

Displays a dialog with the commit logs of the current branch.

Show Status[Bearbeiten]

Shows the working tree status.

Not implemented[Bearbeiten]

  • Create and drop branches.
  • Use of the git-stash-command.



Copyright © 2014-2024 eXept Software AG