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
2022-01-28
Martin Fl
e
ck
[
578422] Extend subscrib
e
r retrieval through extension
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2019-07-16
Mar
t
in Flec
k
[506
9
2
8] Comp
a
risonScop
e
E
d
itorInput does
n
ot respect
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2018-04-19
Mar
t
in Fleck
[51
6
24
8
] Actions f
o
r prev
i
ous/next un
r
es
o
l
v
e
d c
h
ang
e
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-11-22
Martin Fleck
[519021
]
Check attr
i
bute
o
f Multiplicity chang
e
before
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-08
Marti
n
Fleck
[518957] Reuse S
e
manticUMLContentPro
v
ider i
n
stance
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-07
Mart
i
n F
l
eck
[516060] Opaque Actio
n
Body conflict reso
l
ut
i
on results
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-07
M
art
i
n Fleck
[518
5
72] Nav
i
g
atable should use content pro
v
id
e
r to
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-07
Marti
n
Fleck
[518968] On
l
y traverse and cache ne
c
essary Papyr
u
s
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-07
Martin
Fleck
[518983] Co
m
pareInputA
d
a
p
t
er shoul
d
cache
a
n
c
e
stor
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-07
Martin Fleck
[
51
8
9
8
6
] Tit
l
e
o
f compare
e
ditor sh
o
uld be comput
e
d
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-07
Ma
r
ti
n
Fleck
[
5
19003] Ens
u
re u
n
d
o/red
o
is activate when S
M
V has
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-05
Martin Fleck
[518981] A
l
wa
y
s use speci
a
lized
l
ogic when us
i
ng RevisionedU
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-08-31
Martin
F
leck
[
51
9
025] On
l
y cons
i
der references when finding s
t
e
r
eotype
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-07-21
Mart
i
n
Fleck
Relax
C
o
mpare
Considerations of
I
M
ergeViewerIt
e
ms
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-07-07
Martin F
l
eck
[51897
9
] Remove conte
x
t entries with
an empty
cache
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-07-06
Martin
Fleck
[519016] Avoid repeated re
s
ourc
e
t
r
aversal when re
s
olving
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-07-06
Martin Fleck
[51
9
033]
D
o not refresh
the SMV vie
w
er after ev
e
ry
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-07-06
Martin Fle
c
k
[5190
2
3] Check c
a
n
cellation less freq
u
ently
i
n con
f
lict
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-27
Mart
i
n Fleck
[487
1
51] A
c
cept all no
n
-conf
l
icting c
h
a
n
ges fails
t
o
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-27
Martin Flec
k
[
5
14
4
15]
R
elati
o
n
s
hip
s
between diffs should
b
e cach
e
d
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-26
Martin Fle
c
k
[514767] Pro
v
ide preferences to config
u
re comp
a
r
i
son
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-26
M
a
rtin
Flec
k
[
507157] Check usa
g
e of In
p
utSt
r
eams w
i
th moc
k
ito
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-26
M
artin Fleck
[512677] Register EMF
M
odelProvid
e
r
for
n
ew
P
a
p
yru
s
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-26
Martin Fleck
[51
4
382] Pre
-
Merge on conflict
c
an lead to data
loss
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-26
Martin Fleck
[51407
9
]
Implement Mir
r
ori
n
g
: Swap left
/
right
side
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-05-09
Martin Fleck
[514
0
79]
Default to Text
M
ergeV
i
ewer resources for icons
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-04-26
Martin F
l
eck
[512
6
77] Long de
l
ay to c
a
l
culate synchroniz
a
tion
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-04-13
M
a
r
t
in Fleck
[
515041
]
Papyrus
pr
o
file mig
r
atio
n
preventing
r
egular
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-04-10
Martin Flec
k
[512562
]
Dif
f
/
m
e
r
ge can't han
d
le
m
ultiple r
e
pos
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-01-13
Martin F
l
ec
k
[483798] Reg
i
ster Papyr
u
s it
e
m pr
o
vider
for Papyru
s
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-01-13
Martin Fle
c
k
[4
8
3798]
I
n
t
ro
d
uce and use c
o
ntext in adapt
e
r factor
i
es
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2016-07-25
M
artin F
l
eck
[
4
97066] 'Problems' tab should not be
s
ho
w
n automatically
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2016-07-01
Martin
F
l
eck
[495
2
59
]
Add support
for UML profile m
i
g
rat
i
on s
c
enarios
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2016-06-07
M
artin Fle
c
k
[4
9
3527] Corre
c
t
c
onflict wh
e
n c
o
ncurrently
un
a
pplying
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2016-06-03
Martin Fleck
[49
5
334]
[
Testing Framework] An
c
esto
r
not load
e
d correctly
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree