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
Fix diff, conflict detection and merging of non-unique attributes
2019-07-16
Stefan Dirix
C
a
n
c
e
l Faster in P
r
oximit
y
EObj
e
c
t
Matcher
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-05-08
Stefan Di
r
ix
[510442] Fix NPE in MergeView
e
r
Item
P
roviderConfi
g
u
ration
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-04-07
Stefan Dirix
[507050] Fix conflict me
r
ging when pre
-
m
e
rge is set
.
.
.
commit
|
commitdiff
|
tree
2017-01-25
Stefan
Dirix
Avoid redu
n
dant inser
t
ion points
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-01-13
Stefan Dirix
Introduce ContentProviders fo
r
TreeContentMergeVi
e
w
er
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2016-07-28
Stefan Dirix
[498583] Fix NPE
d
uring
automatic
profile migration
commit
|
commitdiff
|
tree
2016-02-15
Stefan Dirix
[4739
8
5] Enable co
m
pa
r
ison dia
l
og in pu
r
e e4
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2016-01-27
Stefan Dirix
[47
4
723] Int
r
o
d
uce IEM
F
Comparison
S
ource
t
o
s
uppo
r
t
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-10-05
Stef
a
n Dirix
[474030] Fi
x
SWTException when Compa
r
eDia
l
og is canceled
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-09-03
Stef
a
n Di
r
ix
[474696]
I
nclude ada
p
terFactory s
c
hema in the build
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-09-02
S
tef
a
n Dirix
[47
5
40
1
] Sort resources
b
efore matching in Strategy
R
esource
M
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-09-02
St
e
fan Dirix
[4
7
54
0
1] Add thr
e
e-way tests for
R
o
otIDMatchingStr
a
tegy
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-09-02
S
tefan
Dirix
[475401] M
o
dify Roo
t
IDMatching
S
t
rategy to only return
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-07-28
Stef
a
n Dirix
[47373
0
] Ignore type descriptions wi
t
h
in UR
I
s
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-05-21
Stefan D
i
rix
[466607] Enhance EMFM
o
d
e
lP
r
o
v
ider
t
o consid
e
r
m
ult
i
ple
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-05-13
S
tefa
n
Dirix
A
d
d Model Resolving C
h
apte
r
to Developer Docum
e
n
t
ation
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-05-11
Stefan Diri
x
[466552] Incr
e
a
s
e priorities of c
o
nflict mergers
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-04-29
Stef
a
n Dirix
[461697] Add
S
aveParameter Hook f
o
r Papyrus m
o
del files
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-04-28
Stefan Dirix
[4607
8
0] Ad
d
Lo
a
dOnDem
a
nd-Pol
i
cy f
o
r
U
M
L2 met
a
model
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-04-28
Stefan Dirix
[464904] Ensure NotL
o
adingReso
u
rceSe
t
l
ooks at
all
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-04-14
Ste
f
an Dirix
[
4
56
6
99] Add Model Resolving Integration Exte
n
sion
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-04-14
Stefan Dirix
A
d
d
Uti
l
Class
to rea
d
Model
Ext
e
n
sion Point of Papyru
s
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-04-07
Stefan
D
irix
Update Matc
h
in
g
Chapter in Developer D
o
cumentation
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-03-09
Stefan
D
ir
i
x
[457652] Give xmi:ids higher
p
ri
o
rity than attribute ids
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-03-09
Ste
f
an Dirix
[461291] Avoi
d
ma
t
ch
i
ng prox
i
es
w
i
t
h
a
ctual
objects i
n
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-03-02
Stefan Dirix
[4
6
1011] Allow cu
s
tomizat
i
on of parent determinati
o
n
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-03-02
S
tefan Dir
i
x
[46
0
675] Fix differences f
o
r nonco
n
ta
i
ned
Fe
a
t
u
reMapEntries
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-03-02
Ste
f
an D
i
ri
x
[
46092
3
]
D
o not filt
e
r FeatureMa
p
C
h
anges
o
n
r
emoved
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-03-02
Stefan
Dirix
[4609
0
2] Fix
D
ependenc
y
Calcula
t
i
o
n
f
or Fe
a
t
ureMap
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2015-02-18
Stefan Dirix
[4
5
2147] Fix handling of di
f
fs fo
r
interlo
c
ked one
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-12-17
S
t
efa
n
Di
r
ix
[45321
8
] Add missing Featur
e
M
a
pC
h
an
g
e
s
c
o
ncern
i
ng Moves
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-12-16
S
tefan
D
irix
[
4
55
2
55] Fix de
t
ermination
o
f
Ta
r
ge
t
F
eature in DiffUt
i
l
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-12-16
St
e
fan Dirix
[4
5
4579] Fix Nullpointer when element is moved out
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-12-03
Stefan Diri
x
[453749] F
i
x
NullPointer
w
hen handli
n
g Non-Conta
i
nm
e
nt
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-11-18
Stefa
n
D
iri
x
[441172]
Extend findMasterE
q
uivalence to not only check
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-11-17
St
e
fan Dirix
[
450
9
49] A
v
oid shortcuts in
D
e
f
aultD
i
f
f
Engine for cert
a
i
n
.
.
.
Signed-off-by:
Stefan Dirix
<sdirix@eclipsesource.com>
commit
|
commitdiff
|
tree
2014-10-20
St
e
fa
n
Dirix
[44
1
172] Fix merge order of e
q
uivalent diffs for one
.
.
.
Signed-off-by:
Stefan Dirix
<st.dirix@gmail.com>
commit
|
commitdiff
|
tree
2014-10-08
S
t
efan Diri
x
Improve Tutori
a
l
Signed-off-by:
Stefan Dirix
<st.dirix@gmail.com>
commit
|
commitdiff
|
tree