Public Git Hosting - EMFCompare2.git/search

2017-09-07	Mathieu Cartaud	[518760] Remove legacy JUnit3 artefacts	commit \| commitdiff \| tree
2017-09-05	Mathieu Cartaud	[462863] Staging Prompt after Resolving Conflicts Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-11-02	Mathieu Cartaud	[506723] Fix merge dependencies for cascading diffs Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-10-17	Mathieu Cartaud	Refactor OverlayImageProvider to use StringBuilders Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-10-17	Mathieu Cartaud	[505986] Fix decorator on conflicting refined diffs Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-10-17	Mathieu Cartaud	[505950] Fix filter not hiding directly pseudo-conflicting... Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-10-13	Mathieu Cartaud	Fix Additive Merge tests Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-10-13	Mathieu Cartaud	[502834] Fix NPE in OpaqueElementBodyChangeAccessor Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-10-13	Mathieu Cartaud	[503035] Fix BreadthFirstIterator where some nodes... Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-09-13	Mathieu Cartaud	Change SMV groups algorithm Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-09-13	Mathieu Cartaud	Activate checkstyle for Git test framework Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-09-12	Mathieu Cartaud	[442897] Fix markers issue in SMV Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-07-11	Mathieu Cartaud	Format with mars formatter files forgotten in previous... Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-07-01	Mathieu Cartaud	Add rebase and cherry-pick operations in test framework Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-07-01	Mathieu Cartaud	Fix test broken by new default preference on pre-merge Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-06-23	Mathieu Cartaud	Activate checkstyle for test framework Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-06-15	Mathieu Cartaud	Switch to Eclipse mars.2 Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-05-31	Mathieu Cartaud	Add EMFCompare specific runner for runtime tests Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-05-10	Mathieu Cartaud	[492261] Merge ResourceAttChange in the right resource Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-04-27	Mathieu Cartaud	[492341] Res Att Change correctly implies diffs Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-02-29	Mathieu Cartaud	Fix git related tests Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-02-26	Mathieu Cartaud	[487561] Fix issue on resource attachment move conflict... Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-02-25	Mathieu Cartaud	Fix error in Git tests setup Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-02-23	Mathieu Cartaud	[487306] Use only relevant diagnostic to compute traversals Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-02-19	Mathieu Cartaud	[487561] Fix missing conflict on resource uncontrol Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-02-19	Mathieu Cartaud	Fix error in the setup of EGit related tests Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-02-19	Mathieu Cartaud	Add Google GSON in target platform (required by JGit) Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-02-09	Mathieu Cartaud	Remove useless method in ResourceAttachmentChangeConflictSearch Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-02-09	Mathieu Cartaud	Reactivate org.eclipse.emf.compare.tests test suite Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-02-03	Mathieu Cartaud	[487011] Fix wrong conflict detection Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-02-01	Mathieu Cartaud	Improve progress monitor to allow cancelling Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-02-01	Mathieu Cartaud	Scalable conflict detector Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-01-27	Mathieu Cartaud	Add missing test suite for Neon build Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-01-26	Mathieu Cartaud	[485266] Fix merge consequences for delete/move conflicts Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-01-22	Mathieu Cartaud	Use JGit provided progress monitor Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-01-20	Mathieu Cartaud	[486093] Don't create log file if logs are off Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-01-13	Mathieu Cartaud	[485538] Fix ClassCastException in MergeResolutionManager Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-01-08	Mathieu Cartaud	[484579] Fix merge consequences algorithm Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-01-08	Mathieu Cartaud	Add debug logging for merge actions Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2016-01-06	Mathieu Cartaud	Fix RCPTT bugs Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-11-04	Mathieu Cartaud	[475935] Fix potential IllegalStateException in MergeViewerItem Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-10-27	Mathieu Cartaud	[473190] Fix NPE in the CompareStructureMergeViewer... Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-10-20	Mathieu Cartaud	[UI tests] Fix papyrus RCPTT tests Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-10-20	Mathieu Cartaud	[UI tests] Fix papyrus RCPTT tests Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-10-19	Mathieu Cartaud	[UI tests] Add tests involving Papyrus & Egit Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-10-15	Mathieu Cartaud	Extract EMFCompareConfiguration from EMFCompareRCPUIPlugin Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-10-13	Mathieu Cartaud	[477769] Papyrus linked ResourceAttachmentChanges Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-10-12	Mathieu Cartaud	Fix bugs caused by an EGit update Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-10-01	Mathieu Cartaud	Implementation of contextual tooltips Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-10-01	Mathieu Cartaud	[478032] Fix accept/reject dropdown icon Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-09-30	Mathieu Cartaud	[464386] Add commit short id to make label more distinguishi... Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-09-23	Mathieu Cartaud	Model Merge Tool + classes to do model merges with... Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-09-15	Mathieu Cartaud	Fix label issues when using the MergeTool on merge... Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-09-03	Mathieu Cartaud	Implementation of contextual tooltips Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-09-03	Mathieu Cartaud	[473190] Fix NPE in the CompareStructureMergeViewer Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-09-02	Mathieu Cartaud	Add a proposal for the modification of Compare UI tooltips. Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-09-02	Mathieu Cartaud	[411485] Fix the CMV display for moves beteen two containers Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-09-02	Mathieu Cartaud	[464386] Add commit short id to make label more distinguishible Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree
2015-08-31	Mathieu Cartaud	[411485] Fix the CMV display for move between two containers Signed-off-by: Mathieu Cartaud <mathieu.cartaud@obeo.fr>	commit \| commitdiff \| tree

Eclipse foundation framework to comapre EMF models

RSS Atom