Skip to main content
summaryrefslogtreecommitdiffstats
path: root/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/merge
AgeCommit message (Expand)AuthorFilesLines
2004-06-23Copyright updates for 3.0Jean Michel-Lemieux4-5/+5
2004-05-17NLSed StringsMichael Valenta1-1/+1
2004-05-10Synchronize view workflow changesMichael Valenta1-19/+7
2004-05-06Changes to allow progress in wizardsMichael Valenta1-9/+3
2004-05-05Allow user to decide if compare and merges are automatically added to the syn...Jean Michel-Lemieux1-8/+17
2004-05-04Improved refresh subscriber task names.I20040503Jean Michel-Lemieux1-1/+1
2004-04-28Initial release of page based synchronize APIMichael Valenta1-1/+17
2004-04-15Use the correct shell.Jean Michel-Lemieux1-9/+2
2004-04-12New progress support - is currently enabled via the workbench work inI20040412aJean Michel-Lemieux1-7/+1
2004-04-12Fix bug caused by Date tag changesMichael Valenta1-3/+2
2004-04-128470: [CVS UI] Date support in check out, compare...Michael Valenta3-10/+53
2004-04-06- made synchronize jobs part of synchronize familyJean Michel-Lemieux1-1/+5
2004-04-02Bug 48827 Progress going on even when Synch view is closedRoot_branch_20040402_layoutOptionsInSynchronizeAdvisorJean Michel-Lemieux1-5/+1
2004-04-0139404: unable to load versionsMichael Valenta1-1/+1
2004-03-19Changes for updated SharingWizardMichael Valenta1-0/+17
2004-03-18Refactored UI packages for consistent naming with core.Jean Michel-Lemieux1-2/+2
2004-03-12Adding changes for compare in dialog and global sync action.Jean Michel-Lemieux1-37/+4
2004-03-09Added several things:Jean Michel-Lemieux1-10/+39
2004-02-26Supported refresh that add participant if needed.Jean Michel-Lemieux1-16/+8
2004-02-25SyncView API released to HEAD.Jean Michel-Lemieux4-417/+0
2003-10-29Initial release of Synchronize View API.Jean Michel-Lemieux2-7/+11
2003-09-0341580: class circularity error upon startupMichael Valenta1-2/+2
2003-08-20Merges are now performed in the backgroundMichael Valenta1-32/+10
2003-07-23Removed setSelection() method in favour of selectSubscriber()Jean Michel-Lemieux1-1/+8
2003-07-23Refactoring of synchronize viewer:Jean Michel-Lemieux1-2/+2
2003-07-09*** empty log message ***Jean Michel-Lemieux1-2/+4
2003-07-09Refactored to avoid initializing subscribers on startupMichael Valenta1-1/+1
2003-06-26Bug 39142: [live sync view] fix merge progress and showing of merge editorJean Michel-Lemieux2-1/+5
2003-06-11Removed refresh from syncviewerJean Michel-Lemieux1-2/+18
2003-06-11New Live Sync view merged in from branch.Jean Michel-Lemieux2-8/+13
2003-03-25Bug 35467 CVS Compare editor doesn't support ctrl-sJean Michel-Lemieux1-3/+0
2003-03-10Fix copyrights - automated changesDean Roberts10-44/+105
2003-03-04Bug 33407 Internal Error message when selecting Team > Synchronize with Targe...Jean Michel-Lemieux1-1/+1
2003-03-03Bug 10754: Compare actions should target source windowJean Michel-Lemieux1-1/+13
2003-01-2128030: [CVS UI] Merge of a incoming deletion with a conflicting change result...Michael Valenta1-0/+22
2002-11-28Fixed unused imports and static referencesMichael Valenta1-1/+0
2002-11-1526507: Error involving folder name with space during Team>MergeMichael Valenta1-6/+10
2002-11-0125083: Merge usability issues and one problemMichael Valenta1-18/+6
2002-10-31Major rework of Repo view including fixes for:Michael Valenta3-4/+4
2002-10-0419966: [CVS Repo View] Order of versions is inconsistent in Repositories view...Michael Valenta1-23/+20
2002-06-25F1 help changesMichael Valenta2-2/+6
2002-06-1117280: DAV: Target site dialog should give focus to sitejames2-2/+10
2002-05-31Added F1 helpMichael Valenta3-0/+24
2002-05-3018273: Tag configuration's 'Browse files for tags' pane is unsortedMichael Valenta1-1/+2
2002-05-3016323: Sharing project already in repo, default should be HEADMichael Valenta2-2/+40
2002-05-1716191: Sharing project already in repo, picking Base, results in tagMichael Valenta2-14/+35
2002-05-07*** empty log message ***james1-2/+3
2002-05-06Added phantoms for deleted folders with file deletion childrenMichael Valenta2-2/+3
2002-05-06Refactor sync view partsjames4-18/+8
2002-05-02Run diff collection wrapped in a Session runnable so that the minimum require...Jean Michel-Lemieux1-32/+0

Back to the top