Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathias Kinzler2010-11-25 16:40:50 -0500
committerMatthias Sohn2010-11-25 16:41:43 -0500
commit1a15e432860bdb33fd975a9708a4a3e04c8e1c74 (patch)
tree6359d25cfa070dad526740c0202319ee8bd9a961 /org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties
parenta37d8fe671659e1264c6d3edf5f94ec9426eddfd (diff)
downloadegit-1a15e432860bdb33fd975a9708a4a3e04c8e1c74.tar.gz
egit-1a15e432860bdb33fd975a9708a4a3e04c8e1c74.tar.xz
egit-1a15e432860bdb33fd975a9708a4a3e04c8e1c74.zip
Initial support for rebase
This is a first implementation of Rebase. Users can select a branch in the Repositories View and have a menu item "Rebase". The currently checked out branch will be rebased onto the selected branch. If no branch is currently checked out, the menu action will not be available. In case of merge conflicts, the rebase will be aborted, i.e. the original HEAD will be restored and the user will receive an error pop-up. This is because we found several problems if the repository is left in state "merging: 1. It is not possible to resolve the conflicts using "add", so the user can not continue with the rebase (in the command line), no matter whether they "add" in EGit or in the command line. 2. There are some issues when "aborting" with the command line a rebase that was started with EGit: HEAD is restored to the wrong branch (i.e. the target branch) These issues will be fixed in subsequent changes. Bug: 328219 Change-Id: I93c4eb78e7cf7c3b589a5c6d04643992667bd69d Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com> Signed-off-by: Matthias Sohn <matthias.sohn@sap.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.properties22
1 files changed, 21 insertions, 1 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 9ee419a5e..13503ff48 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
@@ -1,3 +1,4 @@
+AbortRebaseCommand_CancelDialogTitle=Abort of Rebase was canceled
###############################################################################
# Copyright (c) 2005, 2009 Shawn Pearce and others.
# All rights reserved. This program and the accompanying materials
@@ -7,6 +8,8 @@
#
###############################################################################
+AbortRebaseCommand_CancelDialogMessage=The Abort operation was canceled
+AbortRebaseCommand_JobName=Aborting Rebase
AbstractHistoryCommanndHandler_NoInputMessage=Could not get the current input from the history view
AbstractHistoryCommanndHandler_NoUniqueRepository=Resources belong to different Repositories
Activator_refreshingProjects=Refreshing git managed projects
@@ -158,6 +161,23 @@ CheckoutHandler_SelectBranchMessage=There is more than one branch for this commi
CheckoutHandler_SelectBranchTitle=Select a branch for checkout
CompareWithIndexAction_FileNotInIndex={0} not in index
+RebaseCurrentRefCommand_AbortedDialogMessage=Rebase was aborted due to a merge conflict
+RebaseCurrentRefCommand_AbortedDialogTitle=Rebase aborted
+RebaseCurrentRefCommand_RebaseCanceledMessage=The Rebase operation was canceled
+RebaseCurrentRefCommand_RebaseCanceledTitle=Rebase canceled
+RebaseCurrentRefCommand_RebasingCurrentJobName=Rebasing branch {0}
+RebaseResultDialog_CommitIdLabel=Id:
+RebaseResultDialog_CommitMessageLabel=Message:
+RebaseResultDialog_DetailsGroup=Commit details
+RebaseResultDialog_DialogTitle=Rebase Result
+RebaseResultDialog_DiffCalculationErrorDisplay=An Exception occured while calculating the Diff, please check the Error Log for details
+RebaseResultDialog_DiffCalculationErrorMessage=Could not calculate Diff of current commit
+RebaseResultDialog_DiffDetailsLabel=Diff details:
+RebaseResultDialog_StatusLabel=Result status:
+RebaseTargetSelectionDialog_DialogMessage=Select a branch other than the currently checked out branch
+RebaseTargetSelectionDialog_DialogTitle=Rebase a local branch onto the currently checked out branch
+RebaseTargetSelectionDialog_RebaseButton=&Rebase
+RebaseTargetSelectionDialog_RebaseTitle=Rebase: {0}
RepositoryAction_errorFindingRepo=Could not find a repository associated with this project
RepositoryAction_errorFindingRepoTitle=Cannot Find Repository
RepositoryAction_multiRepoSelection=Cannot perform reset on multiple repositories simultaneously.\n\nPlease select items from only one repository.
@@ -640,7 +660,7 @@ MergeResultDialog_mergeResult=Merge Result
MergeResultDialog_newHead=New Head
MergeResultDialog_result=Result
MergeTargetSelectionDialog_ButtonMerge=&Merge
-MergeTargetSelectionDialog_SelectRef=Select a branch or a tag other than the currently checked out branch or tag.
+MergeTargetSelectionDialog_SelectRef=Select a Ref other than the currently checked out Ref.
MergeTargetSelectionDialog_TitleMerge=Merge: {0}
DecoratorPreferencesPage_addVariablesTitle=Add Variables

Back to the top