diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2013-01-24 04:23:26 +0100 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2013-01-30 11:38:19 -0500 |
| commit | 878e78b307373d558a4e10a18bb6590abf90966a (patch) | |
| tree | 7addfdcd328c46e96325e35d77ed8c4751b965a2 /org.eclipse.jgit/resources | |
| parent | 404de6563d247446d591b6d8bacd5bf5089d82c7 (diff) | |
| download | jgit-878e78b307373d558a4e10a18bb6590abf90966a.tar.gz jgit-878e78b307373d558a4e10a18bb6590abf90966a.zip | |
Fix stash apply using merge logic
Instead of the complicated strange stuff, implement staah
apply as cherry-pick.
Provided there are no conflicts and it is requested that
the index should be applied, perform yet another cherry-pick,
but discard tha results thereof it that would result in conflicts.
Bug: 376035
Change-Id: I553f3a753e0124b102a51f8edbb53ddeff2912e2
Diffstat (limited to 'org.eclipse.jgit/resources')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 6673a8cd4e..b3ef62ad04 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -442,8 +442,11 @@ sourceRefNotSpecifiedForRefspec=Source ref not specified for refspec: {0} squashCommitNotUpdatingHEAD=Squash commit -- not updating HEAD staleRevFlagsOn=Stale RevFlags on {0} startingReadStageWithoutWrittenRequestDataPendingIsNotSupported=Starting read stage without written request data pending is not supported +stashApplyConflict=Applying stashed changes resulted in a conflict +stashApplyConflictInIndex=Applying stashed index changes resulted in a conflict. Dropped index changes. stashApplyFailed=Applying stashed changes did not successfully complete stashApplyOnUnsafeRepository=Cannot apply stashed commit on a repository with state: {0} +stashApplyWithoutHead=Cannot apply stashed commit in an empty repository or onto an unborn branch stashCommitMissingTwoParents=Stashed commit ''{0}'' does not have two parent commits stashDropDeleteRefFailed=Deleting stash reference failed with result: {0} stashDropFailed=Dropping stashed commit failed |