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
[578422] Extend subscriber retrieval through extension points
2022-01-28
M
a
rtin Fleck
[578422
]
Extend
subscribe
r
retrie
v
al
t
hrough e
x
t
ension
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2019-07-16
Ma
r
tin Fleck
[506
9
28] Compa
r
is
o
nScopeEditorInput d
o
es not r
e
spect
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2018-04-19
Martin
F
leck
[516248] Act
i
ons for previous/ne
x
t unresolved
change
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-11-22
Martin Fleck
[5190
2
1] Che
c
k attribu
t
e of Multiplicity c
h
ange
before
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-09-08
Martin Fleck
[518
9
57] Reus
e
Sema
n
t
icUM
L
C
ontentProvider insta
n
c
e
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-09-07
Martin Fleck
[516060] Opaqu
e
Action Bo
d
y conflict resolut
i
on results
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-09-07
Mart
i
n Fleck
[518572] Na
v
igatable
shoul
d
use
c
ontent provider t
o
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-09-07
Martin Fleck
[518
9
68] Only traverse and cache necessary
Papy
r
us
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-09-07
Marti
n
Fleck
[51
8
983]
C
ompareInp
u
tAdapter should cache ancest
o
r
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-09-07
M
a
r
t
in Fleck
[518986]
T
i
t
l
e
of compare edi
t
or sho
u
ld be computed
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-09-07
Martin Fleck
[519003] En
s
ure undo/redo
is activ
a
te whe
n
SM
V
h
as
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-09-05
M
a
rtin Fleck
[51898
1
]
Alway
s
use spec
i
alized l
o
g
i
c when u
s
ing Revisi
o
nedU
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-08-31
Martin Fleck
[519025] Only consider refer
e
nces when findin
g
stereotype
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-07-21
Martin
Fleck
Relax Compare
Considerations o
f
I
MergeVie
w
erItems
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-07-07
Martin
F
l
e
ck
[518979] Remove context entri
e
s w
i
t
h
an empty ca
c
he
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-07-06
Martin
F
leck
[519016
]
Avoid
repeated resourc
e
traversal when resol
v
ing
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-07-06
Martin Fleck
[519033] Do not refre
s
h the SMV viewer after
every
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-07-06
Martin
F
leck
[5190
2
3
]
Che
c
k cancellation less frequently
in confli
c
t
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-06-27
M
a
r
tin F
l
eck
[487151] Accept all
n
on-conflicting ch
a
nges fai
l
s
t
o
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-06-27
Ma
r
t
i
n Fleck
[514
4
1
5
]
Re
l
a
ti
o
nship
s
between diffs should be cached
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-06-26
Martin Fleck
[514
7
67] Provide prefer
e
nces to configure comparis
o
n
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-06-26
M
artin
Fleck
[507157] Ch
e
ck usage of InputS
t
r
e
ams wi
t
h
m
ockito
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-06-26
M
a
r
t
in Fleck
[512677] Register EMF
M
odelP
r
ovide
r
fo
r
new Papyrus
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-06-26
Ma
r
tin Fleck
[514382]
Pre-Merg
e
on conflict can lead to data loss
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-06-26
M
artin Fle
c
k
[514079] Implem
e
n
t Mirroring: S
w
ap l
e
ft/r
i
ght side
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-05-09
Mar
t
in Fle
c
k
[51
4
079] Def
a
ult to Tex
t
Mer
g
eViewer resources f
o
r
i
cons
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-04-26
Martin Flec
k
[
5
1
2
6
77] L
o
n
g
delay to ca
l
c
ulate synchr
o
nizati
o
n
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-04-13
Marti
n
F
l
eck
[51504
1
] Papy
r
us profile
migration preventing
regular
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-04-10
Marti
n
Flec
k
[512562] Diff/merge can't h
a
ndl
e
mul
t
iple repos
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-01-13
Martin
Fleck
[4837
9
8] Register Pa
p
yr
u
s ite
m
provid
e
r for Papyrus
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2017-01-13
M
a
rt
i
n Fleck
[483798] Introduce
a
n
d u
s
e c
o
n
te
x
t in adapt
e
r
fac
t
ories
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2016-07-25
Martin Fleck
[497066] 'Problems
'
tab should no
t
be show
n
automatica
l
ly
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2016-07-01
M
a
rt
i
n
F
leck
[4952
5
9] A
d
d support for UML
profile
mig
r
ation s
c
ena
r
ios
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2016-06-07
M
a
r
tin Fleck
[493527] Co
r
rect conflict when co
n
current
l
y una
p
plying
.
.
.
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree
2016-06-03
Martin Fleck
[495334]
[
T
e
st
i
ng F
r
a
mewo
r
k] Ancestor not loaded correctly
Signed-off-by: Martin Fleck <
mfleck@eclipsesource.com
>
commit
|
commitdiff
|
tree