repo.or.cz
/
EMFCompare2.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Bump version to 3.3.18
2019-07-16
S
te
f
an Dirix
Cancel
F
aster in ProximityEObj
e
ctMatcher
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-05-08
Stefan Dirix
[
5
10442]
F
ix NPE in Merge
V
iewe
r
I
t
emProvide
r
C
o
n
f
igu
r
at
i
on
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-04-07
Stefan Dirix
[
50705
0
] Fix
c
onflict mergi
n
g when pre-
m
erge is
s
et
.
.
.
commit
|
commitdiff
|
tree
2017-01-25
S
tefan Dirix
Avoid redundant insertion poi
n
ts
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-01-13
Stefan Di
r
ix
I
nt
r
oduce Conte
n
tProviders for
TreeCo
n
ten
t
Mer
g
eViewer
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2016-07-28
Stefan D
i
ri
x
[498583]
F
i
x
NPE
during
a
utomatic profile m
i
gration
commit
|
commitdiff
|
tree
2016-02-15
Stef
a
n Dirix
[473985
]
Enable
compariso
n
dialog
i
n pure e
4
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2016-01-27
Stefan Dirix
[474723] Introduce IEMFC
o
mpar
i
sonS
o
urce to
s
upport
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-10-05
Ste
f
an
D
irix
[
4
74
0
30] F
i
x SWTEx
c
eption
when CompareDi
a
log is canc
e
led
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-09-03
S
t
efan
Dirix
[474696] Include adapterFa
c
tory
s
c
h
em
a
in
the build
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-09-02
S
tefan
D
irix
[475401
]
Sort re
s
ource
s
before matching in Strat
e
gyResou
r
ceM
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-09-02
Stefan
Dirix
[47
5
401] Add three-way tests for RootID
M
atc
h
ingStrate
g
y
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-09-02
Stefan Dirix
[475401] Modify
RootIDMatc
h
ingS
t
ra
t
egy t
o
o
nly return
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-07-28
Stefan
D
ir
i
x
[47
3
730] Ignore t
y
pe
desc
r
ip
t
ions wi
t
h
in URIs
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-05-21
Stefan
Dirix
[
466607]
Enhance EM
F
Mode
l
Pro
v
ider to consider
m
u
lt
i
ple
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-05-13
Stefan
Diri
x
Add Model
Re
s
olvi
n
g
Chapter to Developer Documentation
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-05-11
S
tefan Dirix
[466552] I
n
cre
a
se priorities of
confl
i
c
t
mergers
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-04-29
S
t
e
f
an Dirix
[461697] Add SaveParam
e
ter Hook for Pa
p
yrus m
o
del file
s
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-04-28
Stefan Dirix
[
4
607
8
0] Ad
d
Loa
d
OnDemand
-
Policy for U
M
L
2 metamodel
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-04-28
Stefan Diri
x
[464904] Ensure NotLoadingResourceSet looks at all
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-04-14
Ste
f
an Di
r
ix
[456699] Add Model
R
esolving
I
ntegration Extensio
n
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-04-14
Stefan Dirix
Add Util
Clas
s
to re
a
d Mod
e
l
Extension
P
oin
t
of Papyrus
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-04-07
Stefan Dirix
Update Match
i
n
g
C
hapter in De
v
eloper D
o
cumentatio
n
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-03-09
Stefan Di
r
ix
[457652] Give xmi:ids high
e
r
pr
i
ority than attribute ids
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-03-09
Ste
f
an Dirix
[46
1
291] Av
o
id matching
proxies with actual objects in
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-03-02
Stefan Dirix
[4610
1
1] Al
l
o
w customizat
i
on of parent determi
n
ation
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-03-02
S
t
efan Dirix
[46067
5
]
F
ix d
i
f
f
e
r
ences for non
c
ont
a
ined
F
eatu
r
eMap
E
ntries
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-03-02
S
t
efan Diri
x
[
46
0
923] D
o
not filter Fe
a
tureMapChanges on r
e
mo
v
ed
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-03-02
Stefan Dirix
[460902] Fix Dep
e
nden
c
y Calculation for FeatureMap
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-02-18
S
t
efan Dirix
[45214
7
]
F
ix handling of diffs f
o
r interlocke
d
one
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-12-17
Stefan
Dirix
[4532
1
8]
A
dd
m
issing FeatureM
a
pChanges concerning
Moves
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-12-16
St
e
fan Dirix
[45
5
255] Fix
deter
m
ina
t
ion of Targ
e
tFeature in D
i
ffU
t
il
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-12-16
Stefan
Dirix
[4
5
4579] F
i
x Nullpointer w
h
en
e
leme
n
t is mo
v
ed out
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-12-03
Ste
f
an
Diri
x
[453749]
F
ix NullPointer when handl
i
ng
Non
-
Containme
n
t
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-11-18
Stefan
D
irix
[4411
7
2]
E
x
tend findMasterEqu
i
valence to not only check
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-11-17
S
t
efan
D
irix
[
450
9
49] Avo
i
d shortcuts
i
n DefaultDi
f
fEng
i
n
e for certain
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-10-20
St
e
fan Dirix
[441172] Fix merge order of e
q
u
i
valent diffs for one
.
.
.
Signed-off-by:
Stefan Dirix
<st.dirix@gmail.com>
commit
|
commitdiff
|
tree
2014-10-08
Ste
f
an D
i
rix
I
m
prove Tutoria
l
Signed-off-by:
Stefan Dirix
<st.dirix@gmail.com>
commit
|
commitdiff
|
tree