Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
AgeCommit message (Expand)AuthorFilesLines
2019-05-19Bug 547304 - [cleanup] Fix wrong space/tab indentationS4_12_0_RC2S4_12_0_RC1aS4_12_0_RC1S4_12_0_M3R4_12I20190605-1800I20190605-0600I20190604-1800I20190604-0600I20190603-1800I20190603-0600I20190602-1800I20190602-0600I20190601-1800I20190531-1800I20190531-0245I20190529-2005I20190529-1800I20190529-0600I20190528-1800I20190528-0915I20190528-0850I20190528-0600I20190527-1805I20190527-0600I20190526-1800I20190526-0600I20190525-1800I20190525-0600I20190524-1800I20190524-0135I20190522-1800I20190522-0600I20190521-1800I20190521-0600I20190520-1805I20190520-0600R4_12_maintenancePaul Pazderski1-1/+1
2019-04-18Remove useless casts from cvs.core.Alexander Kurtakov1-1/+1
2019-04-17Remove useless non-javadoc/@see comments.Alexander Kurtakov1-21/+9
2019-02-14Resolve raw type warningsI20190215-0055Karsten Thoms1-2/+2
2018-08-27Bug 535802 - EPL 2.0 conversion for team bundlesLars Vogel1-3/+6
2013-05-15Fixed compile warning (touching cvs.core)I20130521-2000I20130520-2000I20130519-2000I20130518-1500I20130516-2200I20130516-1800I20130516-1600I20130515-2000Dani Megert1-1/+3
2011-01-03bug 315694: Team > Merge operation for project contains logical model always ...Tomasz Zarna1-6/+10
2006-04-10Bug 135771 need to adopt ICU4J APIsBogdan Gheorghe1-1/+4
2006-03-29Updated copyrightsMichael Valenta1-2/+2
2006-01-07Bug 114661 [Merge API] CVS Merge should use IResourceMappingMergerMichael Valenta1-1/+1
2005-08-04Removed unnecessary NLS tagsMichael Valenta1-1/+1
2005-04-05Converted to using Runtime NLS supportMichael Valenta1-1/+2
2005-03-18Removed unused codeMichael Valenta1-1/+1
2005-02-22Changing to EPLMichael Valenta1-3/+3
2004-06-23Copyright updates for 3.0Jean Michel-Lemieux1-2/+2
2004-03-3055207: Merge does not see files/dirs deleted in stream where changes come fromMichael Valenta1-83/+78
2004-03-09Added several things:Jean Michel-Lemieux1-2/+3
2004-03-03Refactoring of subscribers and resource variantsMichael Valenta1-3/+3
2004-02-27More refactoring of ResourceVariantTreeMichael Valenta1-75/+52
2004-02-26Fixed up compile errors.Jean Michel-Lemieux1-7/+22
2004-02-26Added equal() checks to compare and merge subscribersJean Michel-Lemieux1-22/+18
2004-02-26*** empty log message ***Michael Valenta1-24/+54
2004-02-26Refactored ResourceVariantTreeMichael Valenta1-9/+14
2004-02-25SyncView API released to HEAD.Jean Michel-Lemieux1-94/+168
2003-11-0745652: Sync stops if one project fails to connectMichael Valenta1-2/+2
2003-10-29Initial release of Synchronize View API.Jean Michel-Lemieux1-74/+4
2003-09-11Mark as merged didn't work when remote was deleted.Jean Michel-Lemieux1-1/+2
2003-09-10Cleaned up RemoteBytesSynchronizerMichael Valenta1-1/+1
2003-09-10Generalized RemoteSynchronizersRoot_branch_20030910_RepositoryProviderLockingMichael Valenta1-9/+9
2003-09-0341967: [CVS Merge] NPE in restoreMichael Valenta1-1/+1
2003-09-0341580: class circularity error upon startupMichael Valenta1-2/+2
2003-08-22Refactored to properly detect cases where the sync info for Michael Valenta1-1/+0
2003-08-22NLS PassMichael Valenta1-17/+18
2003-08-2140014: Exception after opening Live Sync viewMichael Valenta1-1/+2
2003-08-19Default the merge to use content comparison.Jean Michel-Lemieux1-9/+9
2003-07-24*** empty log message ***Jean Michel-Lemieux1-1/+23
2003-07-23Refactoring of synchronize viewer:Jean Michel-Lemieux1-1/+1
2003-07-16Removed unused importsMichael Valenta1-1/+0
2003-07-1540129: [CVS Merge] Fetching remote contents in a deltaMichael Valenta1-7/+8
2003-07-14*** empty log message ***Michael Valenta1-13/+1
2003-07-0839390: [CVS Merge] Need Mark As Merged ActionMichael Valenta1-2/+10
2003-07-07Background sync class moved to UI and refreshes only the current input Jean Michel-Lemieux1-1/+1
2003-06-18allow marking merged resources on update in the merge subscriberJean Michel-Lemieux1-14/+122
2003-06-1730502: [CVS Core UI] Stacktrace lost when status loggedMichael Valenta1-1/+1
2003-06-11New Live Sync view merged in from branch.Jean Michel-Lemieux1-0/+200

    Back to the top