Skip to main content
summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/subscriber/MergeUpdateAction.java
AgeCommit message (Expand)AuthorFilesLines
2004-06-23Copyright updates for 3.0Jean Michel-Lemieux1-2/+2
2004-05-06Changes to allow progress in wizardsMichael Valenta1-5/+13
2004-03-18Refactored UI packages for consistent naming with core.Jean Michel-Lemieux1-2/+2
2004-03-16Refactored model ui partsJean Michel-Lemieux1-4/+4
2004-03-10Made TeamOperation APIMichael Valenta1-2/+2
2004-03-09Refactoring SubscriberActionRoot_branch_I20040315Michael Valenta1-129/+16
2004-02-25SyncView API released to HEAD.Jean Michel-Lemieux1-73/+12
2003-12-1148352: NPE in CVSSyncInfo.makeInSyncMichael Valenta1-6/+8
2003-12-1148352: NPE in CVSSyncInfo.makeInSyncMichael Valenta1-13/+13
2003-11-04Bug 46007 Merge changes not shown in Sync viewJean Michel-Lemieux1-1/+1
2003-10-29Initial release of Synchronize View API.Jean Michel-Lemieux1-5/+5
2003-09-11Bug 42889 [Live Sync View] subscriber actions useing wrong subscriberJean Michel-Lemieux1-6/+11
2003-09-10Generalized RemoteSynchronizersRoot_branch_20030910_RepositoryProviderLockingMichael Valenta1-1/+1
2003-09-0241943: [CVS Concurrency] Checkout feedback problemsMichael Valenta1-1/+1
2003-08-22Added specific job names for update, merge and commitMichael Valenta1-2/+8
2003-08-05Added explicit override and commit action and change dupdate to not perform t...Jean Michel-Lemieux1-1/+8
2003-08-05Removed SubscriberActionContributions in favor of using IActionFilter mechanismJean Michel-Lemieux1-40/+44
2003-07-0838966: [live sync view] CVS update action doesn't consider auto-mergeable con...Michael Valenta1-177/+37
2003-07-0839147: [live sync view] subscriber actions should adapt to SyncInfoMichael Valenta1-33/+30
2003-06-2338856: [CVS Merge] Change button labels in Update promptMichael Valenta1-1/+1
2003-06-18allow marking merged resources on update in the merge subscriberJean Michel-Lemieux1-5/+19
2003-06-17Fix fo problem when merging conflictsI20030617Michael Valenta1-1/+1
2003-06-11New Live Sync view merged in from branch.Jean Michel-Lemieux1-0/+327

    Back to the top