diff options
| author | Dariusz Luksza | 2010-07-29 19:04:54 +0000 |
|---|---|---|
| committer | Chris Aniszczyk | 2010-08-05 19:29:01 +0000 |
| commit | 986e3823e1e3555bda426b3b09bd790d4595113a (patch) | |
| tree | f6bc423e63d485003eb3f8bfc30243b96956675b /org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties | |
| parent | 9d4a7f54b6d40ff2c523bc817e4cc57ff6def47d (diff) | |
| download | egit-986e3823e1e3555bda426b3b09bd790d4595113a.tar.gz egit-986e3823e1e3555bda426b3b09bd790d4595113a.tar.xz egit-986e3823e1e3555bda426b3b09bd790d4595113a.zip | |
Fixes obtaining common ancestor in Synchronize view
For obtaining common base ancestor I've used suggested RevWalk with
RevFilter.MERGE_BASE. For API compatibility it is also used for
obtaining remote variant. This patch also improves the
GitResourceVariant implementation. I replaced all dependencies to
the deprecated TreeEntry with the proper RevObject implementation.
Bug: 317934
CQ: 4390
Change-Id: I8f5352862d01e5a5475a74f222241970cd7960ee
Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Diffstat (limited to 'org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties')
| -rw-r--r-- | org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties b/org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties index 8101d4482a..a00fbaa470 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/coretext.properties @@ -108,12 +108,14 @@ TagOperation_performingTagging=Making tag {0} TagOperation_taggingFailure=Tag {0} creation failed (cause: {1}) TagOperation_objectIdNotFound=Could not find object Id associated with tag {0} (cause: {1}) -GitResourceVariantTree_couldNotFindBlob=Could not find blob member for {0} -GitResourceVariantTree_fetchingMembers=Fetching members of {0} +GitFolderResourceVariant_fetchingMembers=Fetching members of {0} + +GitResourceVariantTree_couldNotFindResourceVariant=Could not find variant for resource: {0} +GitResourceVariantTree_couldNotFetchMembers=Could not fetch members of {0} GitResourceVariantTree_fetchingVariant=Fetching variant for: {0} -GitResourceVariantTree_unableToReadRepository="Unable to read repository for {0} +GitResourceVariantTree_couldNotFetchMembersOf=Could not fetch members of {0} GitBranchResourceVariantTreeSubscriber_gitRepository=Git without local changes OperationAlreadyExecuted=Operation has already been executed and can not be executed again OperationNotYetExecuted=Operation has not yet been executed and can not return a result -RemoteRefUpdateCantBeReused=The RemoteRefUpdate instance can not be re-used
\ No newline at end of file +RemoteRefUpdateCantBeReused=The RemoteRefUpdate instance can not be re-used |