Public Git Hosting - EMFCompare2.git/search

2016-06-03	Martin Fleck	[495334] [Testing Framework] Ancestor not loaded correctly	commit \| commitdiff \| tree
2016-05-31	Mathieu Cartaud	Add EMFCompare specific runner for runtime tests	commit \| commitdiff \| tree
2016-05-31	Laurent Delaigue	[493650] Fix order of merged children Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-05-30	Laurent Delaigue	Fix wrong conflict detections Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-05-30	Laurent Goubet	[494723] Use safeEGet instead of eGet	commit \| commitdiff \| tree
2016-05-30	Laurent Delaigue	Remove jdt.annotations from Target Platforms Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-05-27	Laurent Delaigue	Remove unused msg in mergetext.properties Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-05-20	Andreas Mayer	[471045] Fix ArrayIndexOutOfBoundsException in model... Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-05-18	Alexandra Buzila	[492190] Stereotypes not displayed in SMV for SYSML...	commit \| commitdiff \| tree
2016-05-12	Laurent Delaigue	Fix checkstyle on RACConflictSearch Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-05-10	Mathieu Cartaud	[492261] Merge ResourceAttChange in the right resource	commit \| commitdiff \| tree
2016-05-09	Laurent Delaigue	[493255] Fix scalable conflict detector Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-05-09	Simon Delisle	[488089] Fix random position of diagrams after merge Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-04-21	Philip Langer	[488700] Change label to Conflict [X out of Y differences...	commit \| commitdiff \| tree
2016-03-25	Laurent Delaigue	[490430] Fix StackOverflowError Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-02-29	Laurent Delaigue	Fix target platform for mars Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-02-26	Laurent Delaigue	[488549] Fix disposed widget in ProblemIndicationComposite Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-02-26	Laurent Delaigue	[467547] Fix IllegalArgumentException in CompareToolBar Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-02-26	Laurent Delaigue	Fix NPEs because comp.getMatch can return null Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-02-26	Mathieu Cartaud	[487561] Fix issue on resource attachment move conflict...	commit \| commitdiff \| tree
2016-02-12	Philip Langer	[479449] Add specification for multiplicity change	commit \| commitdiff \| tree
2016-02-12	Philip Langer	[485494] Add specification of di-file change ignore...	commit \| commitdiff \| tree
2016-02-02	Laurent Delaigue	[485513] Fix NPE in NameMatchingStrategy.findMatch Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-02-01	Mathieu Cartaud	Improve progress monitor to allow cancelling	commit \| commitdiff \| tree
2016-01-27	Stefan Dirix	[474723] Introduce IEMFComparisonSource to support...	commit \| commitdiff \| tree
2016-01-20	Laurent Delaigue	[485020] Fix EditionDistance weight provider Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-01-20	Laurent Delaigue	Fix NPE in ThreeWayComparisonGroupProvider Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-01-20	Laurent Delaigue	[485512] Fix NPE in ResourceDependencyProvider Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-01-19	Philip Langer	[485494] Add missing java-doc to IgnoreDiFilePostProcessor	commit \| commitdiff \| tree
2016-01-19	Laurent Delaigue	Improve logs Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-01-15	Alexandra Buzila	[484557] ResourceAttachment vs Attribute conflicts	commit \| commitdiff \| tree
2016-01-11	Laurent Delaigue	[483892] Take match engine registry into account Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-01-08	Laurent Delaigue	Improve logging during comparison for conflicts Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-01-06	Laurent Delaigue	Make required differences order deterministic Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-01-05	Laurent Delaigue	Fix signature of predicate Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-01-05	Laurent Delaigue	NPE in ResourceAttachmentChangeTooltipProvider Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-01-05	Laurent Delaigue	[484557] ResourceAttachment vs Attribute conflicts Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-01-05	Laurent Delaigue	[484576] Fix bug on pseudo-conflict computation Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-01-05	Laurent Delaigue	[484577] Make sure 'requires' are on the same side Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2016-01-05	Laurent Delaigue	Remove dangerous & useless Post-Processor Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-12-17	Laurent Delaigue	[484543] NPE in EMFCompareContentMergeViewer Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-12-17	Laurent Delaigue	[484542] NPE in ReferenceChangeTooltipProvider Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-12-11	Laurent Delaigue	Fix performance tests, again Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-12-11	Laurent Delaigue	Fix performance tests Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-12-10	Laurent Delaigue	Fix warnings in ModelGitMergeEditorInput Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-12-09	Laurent Delaigue	Fix more RCPTT tests Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-12-08	Laurent Delaigue	Fix bug in "Replace with Local History" Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-12-04	Axel Richard	Make documentation less ambiguous Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-12-03	Laurent Goubet	[480388] Avoid recursion when loading packages or profiles.	commit \| commitdiff \| tree
2015-12-03	Laurent Goubet	[480395] Avoid calling EcoreUtil.getURI() as much as...	commit \| commitdiff \| tree
2015-10-26	Laurent Delaigue	[473997] wrong logical model proxy resolution Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-10-23	Philip Langer	[476295] Add test cases	commit \| commitdiff \| tree
2015-10-23	Philip Langer	Add additional test case with unrelated file that is...	commit \| commitdiff \| tree
2015-10-23	Philip Langer	[475890] Add AbstractGitMergeTestCase and test case...	commit \| commitdiff \| tree
2015-10-23	Philip Langer	Add means to also stage deleted files before committing	commit \| commitdiff \| tree
2015-10-22	Axel Richard	[478539] Refining conflicted diff doesn't show sub...	commit \| commitdiff \| tree
2015-09-18	Laurent Delaigue	Remove dependency to rcp in emf.compare.tests Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-09-18	Laurent Delaigue	[477607] Fix erroneous conflict detection on uncontrol Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-09-18	Laurent Delaigue	Fix NPE in EMFResourceMappingMerger Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-09-10	Laurent Delaigue	[464379] Invert resource matching strategies Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-09-07	Laurent Delaigue	Revert "Implementation of contextual tooltips"	commit \| commitdiff \| tree
2015-07-07	Laurent Delaigue	[471010] Fix log4j config management Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-06-26	Laurent Delaigue	Improve robustness of ResourceComputationSchedulerTest Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-06-23	Laurent Delaigue	Simplify code in ResourceDependencyLocalResolver Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-06-22	Laurent Delaigue	Fix NPE in EMFModelProvider Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-06-22	Laurent Delaigue	Happy boy-scout: remove unused import Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-06-22	Laurent Goubet	Caching - Don't minimize the logical model eagerly	commit \| commitdiff \| tree
2015-06-22	Laurent Delaigue	ComparisonUtil.getComparison(diff) where needed Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-06-15	Philip Langer	Fix minor typo in javadoc	commit \| commitdiff \| tree
2015-06-15	Axel Richard	[458961] Fix Coordinates change contains diffs from...	commit \| commitdiff \| tree
2015-06-10	Axel Richard	[459131] Fix Re-connect changed resources & random...	commit \| commitdiff \| tree
2015-06-10	Axel Richard	Bump feature versions to 3.2.0 on master	commit \| commitdiff \| tree
2015-06-01	Michael Borkowski	[467677] Detection of binary identical resources Also-by: Laurent Delaigue <laurent.delaigue@obeo.fr> Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-06-01	Axel Richard	[468740] Fix By Side Group Provider: Left Side Group...	commit \| commitdiff \| tree
2015-05-28	Laurent Delaigue	[462842] Edge reconnect with UML. Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-05-28	Axel Richard	Fix typos in core sdk & egit sdk feature names	commit \| commitdiff \| tree
2015-05-27	Axel Richard	[467684] Fix CompareToolbar is grayed out after saving	commit \| commitdiff \| tree
2015-05-27	Axel Richard	[468267] Fix NPE in EMFCompareDiffTreeRuler#findFirstAncesto...	commit \| commitdiff \| tree
2015-05-18	Laurent Delaigue	[462938] Prevent infinite loop during merge. Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-05-13	Laurent Delaigue	Added final to class variables. Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-05-13	Laurent Delaigue	Added logs. Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-05-05	Axel Richard	[463785] ResourceLocationChange: UI changes	commit \| commitdiff \| tree
2015-05-05	Axel Richard	[463785] ResourceLocationChange: core changes. Also-by: Laurent Delaigue <laurent.delaigue@obeo.fr> Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-04-29	Stefan Dirix	[461697] Add SaveParameter Hook for Papyrus model files	commit \| commitdiff \| tree
2015-04-29	Laurent Delaigue	[460773] Register model resolver on model file extensions. Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-04-28	Stefan Dirix	[460780] Add LoadOnDemand-Policy for UML2 metamodel.	commit \| commitdiff \| tree
2015-04-28	Stefan Dirix	[464904] Ensure NotLoadingResourceSet looks at all...	commit \| commitdiff \| tree
2015-04-27	Axel Richard	[463785] Add new concept in EMF Compare: ResourceLocationChange	commit \| commitdiff \| tree
2015-04-17	Philip Langer	[464691] Fixes typo in message key of ancestor side	commit \| commitdiff \| tree
2015-04-15	Laurent Goubet	Do not remove read-only storages from comparison scope	commit \| commitdiff \| tree
2015-04-14	Stefan Dirix	Add Util Class to read Model Extension Point of Papyrus.	commit \| commitdiff \| tree
2015-04-14	Axel Richard	[464379] Matching resources should use id strategy...	commit \| commitdiff \| tree
2015-04-10	Laurent Delaigue	Updated target platforms definitions. Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-04-01	Axel Richard	[442265][460782] Avoid Infinite "please wait" viewer.	commit \| commitdiff \| tree
2015-03-24	Axel Richard	[461986] [UI] Tests - Intermediate Proxies Resolution	commit \| commitdiff \| tree
2015-03-24	Axel Richard	[461986] Fix bug in Intermediate Proxies Resolution	commit \| commitdiff \| tree
2015-03-24	Laurent Goubet	[460317] Shouldn't use == to compare URIs.	commit \| commitdiff \| tree
2015-03-20	Laurent Delaigue	Fix bug of creating equivalence with only one diff. Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-03-13	Laurent Delaigue	[462072] Fixes ClassCastException on EAttribute Feature... Signed-off-by: Laurent Delaigue <laurent.delaigue@obeo.fr>	commit \| commitdiff \| tree
2015-03-13	Axel Richard	[442227] Compare an untracked file with HEAD.	commit \| commitdiff \| tree
next

Eclipse foundation framework to comapre EMF models

RSS Atom