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
Make sure folders are created when extracting input files
2019-07-16
Martin Fleck
[506928] ComparisonScopeEditorInput does n
o
t respect
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2018-04-19
Mar
t
i
n Fleck
[
5
1
6
24
8
] Actions for
previous/n
e
xt unreso
l
ved change
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-11-22
M
a
rtin Fleck
[519021] Check attribute
o
f
Multip
l
i
city change before
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-08
Ma
r
ti
n
Fl
e
c
k
[
5
1
8957]
R
euse Semanti
c
UMLContentProvider inst
a
nc
e
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-07
Martin Fleck
[
516060] Opaque Ac
t
i
o
n Body conflic
t
reso
l
ution result
s
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-07
Ma
r
tin Fleck
[518
5
72] Navigatable should use con
t
ent provider to
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-07
Ma
r
t
in
Fle
c
k
[5
1
8968] Only traverse
a
nd cache nece
s
sary P
a
pyrus
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-07
Martin Fleck
[5189
8
3] CompareInp
u
tA
d
apter sh
o
ul
d
c
a
che ancest
o
r
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-07
Martin Fleck
[518986] Title of compare edit
o
r
should be compute
d
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-07
Martin F
l
e
c
k
[
5
19003] Ensure undo
/
re
d
o
i
s a
c
tivate
w
hen
S
M
V h
a
s
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-05
Martin Fl
e
ck
[518981]
A
lways u
s
e specialized logic w
h
en using
RevisionedU
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-08-31
Martin Fleck
[
5
19025]
O
nly c
o
nsider refer
e
nces
w
he
n
finding ste
r
eotype
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-07-21
Ma
r
tin F
l
eck
Relax
C
om
p
ar
e
Consider
a
tions of IM
e
r
g
eViewerItems
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-07-07
Martin
Fleck
[518979] R
e
m
o
ve conte
x
t entr
i
es with
an empty
cache
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-07-06
Marti
n
Fl
e
c
k
[
5
1
9
016]
A
voi
d
repea
t
ed resource
traversal whe
n
r
e
so
l
ving
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-07-06
Martin Fleck
[
519033] Do not
refresh the SMV viewer after
every
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-07-06
M
a
rtin
F
leck
[519023] Check c
a
ncellation le
s
s frequently i
n
conflict
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-27
Marti
n
Fleck
[487151
]
Accept
a
ll non-con
f
licting changes fails
t
o
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-27
M
a
rtin Fleck
[514415] Re
l
at
i
o
nships between diffs should be
c
ached
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-26
Martin Fleck
[
514767] Provide prefe
r
ences to c
o
nfigu
r
e comparison
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-26
Ma
r
t
in Fl
e
ck
[507157] Check usage of InputStreams w
i
th m
o
c
k
it
o
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-26
Mart
i
n Fleck
[512677
]
Register EMFModelPro
v
ider f
o
r new
P
a
pyrus
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-26
Martin Fleck
[5
1
4382]
P
re-Merge on co
n
flict
can lead to d
a
t
a loss
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-26
Ma
r
tin Fleck
[
51407
9
] Implement Mirrori
n
g:
S
wap left/right side
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-05-09
Ma
r
tin
Fleck
[514079] Default to Text
M
e
r
geViewer resou
r
ces for i
c
o
ns
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-04-26
Martin
Fleck
[512677] Lo
n
g delay
to calculate syn
c
hr
o
nizatio
n
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-04-13
Ma
r
t
i
n Fleck
[5150
4
1] Pa
p
yrus prof
i
le migration prev
e
nting regul
a
r
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-04-10
M
artin Fleck
[512562] Diff/merge can't hand
l
e multi
p
le repos
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-01-13
Ma
r
tin
F
l
e
c
k
[483798] Register Papy
r
us item pro
v
i
der fo
r
Papyrus
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-01-13
Martin
Fl
e
ck
[483798] I
n
t
roduce an
d
use con
t
ext in
a
dapter factories
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2016-07-25
M
artin Fleck
[497066] 'Problems' tab shoul
d
no
t
be sho
w
n automatic
a
lly
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2016-07-01
Martin
F
leck
[495259] Add s
u
pport fo
r
UML profil
e
migration sc
e
narios
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2016-06-07
Mar
t
in
Fle
c
k
[
4
93527] Correct
con
f
lict whe
n
c
o
ncurrently u
n
applyi
n
g
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2016-06-03
M
a
rti
n
Flec
k
[495334] [Testing Fra
m
e
work] Ancestor not
loaded co
r
rectly
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree