diff options
| author | Benjamin Muskalla | 2011-08-25 16:03:57 +0000 |
|---|---|---|
| committer | Benjamin Muskalla | 2011-08-25 16:03:57 +0000 |
| commit | 37c41eeefdc015a977127a9705518906bb64ba7d (patch) | |
| tree | 4ac4e771c4e7c820bc5645162e67eb8f4fb50075 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties | |
| parent | ab171b97b1f8f9dae63426f2a029db3c244e3718 (diff) | |
| download | egit-37c41eeefdc015a977127a9705518906bb64ba7d.tar.gz egit-37c41eeefdc015a977127a9705518906bb64ba7d.tar.xz egit-37c41eeefdc015a977127a9705518906bb64ba7d.zip | |
Consider logical models in commit action
While commiting files to the repository, we should ask all model
providers if this set of resources is consistent in itself or if you
need to commit more resources to have a consistent model.
Bug: 346450
Change-Id: I79312945550580afee5b1c5a9fae06288a27867d
Signed-off-by: Benjamin Muskalla <benjamin.muskalla@tasktop.com>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties')
| -rw-r--r-- | org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties index 2e0dce84ee..eea7aad931 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties @@ -982,6 +982,8 @@ GitImportWithDirectoriesPage_PageMessage=Depending on the wizard, you may select GitImportWithDirectoriesPage_PageTitle=Select a wizard to use for importing projects GitImportWithDirectoriesPage_SelectFolderMessage=Please select a folder GitImportWizard_WizardTitle=Import Projects from Git +GitScopeOperation_couldNotDetermineState=Could not determine state of changed files +GitScopeOperation_GitScopeManager=Git Scope Manager GitSelectRepositoryPage_AddButton=&Add... GitSelectRepositoryPage_AddTooltip=Add a Git repository from the local file system GitSelectRepositoryPage_CloneButton=&Clone... @@ -1075,6 +1077,8 @@ CommitAction_ErrorReadingMergeMsg=Error reading from file .git/MERGE_MSG CommitAction_MergeHeadErrorMessage=The file .git/MERGE_MSG was not found although being in state "merged". CommitAction_MergeHeadErrorTitle=Inconsistent Merge State CommitActionHandler_calculatingChanges=Calculating changes in selected repositories +CommitActionHandler_errorBuildingScope=Error occurred while building scope for committing changes +CommitActionHandler_lookingForChanges=Looking for uncommitted changes CommitActionHandler_repository=Repository: {0} CommitEditor_couldNotShowRepository=Could not show repository CommitEditor_showGitRepo=Show Git repository |