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 versions to 3.3.11
2019-07-16
Marti
n
Fleck
[5069
2
8] Co
m
parisonScopeEditorInput does not r
e
spect
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2018-04-19
M
a
rtin
Fle
c
k
[5162
4
8] Actions for
previo
u
s
/
next unresolved change
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-11-22
Martin Flec
k
[5190
2
1] Check att
r
ibute of Multiplicity change before
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-08
Martin Fleck
[518957] Reuse SemanticU
M
LContentProvider instanc
e
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-07
Martin Fleck
[516060] Opaq
u
e
Action Body conflic
t
resolution r
e
s
u
lts
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-07
Martin Fleck
[5185
7
2] Na
v
igatable should
use content provid
e
r
to
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-07
M
a
rtin Fleck
[518968]
Only traverse and
c
ache necessary Papyrus
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-07
M
a
rtin
F
leck
[
5
1
8
983] CompareInputAdapt
e
r s
h
ould cache ances
t
or
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-07
Martin Flec
k
[5
1
8
986] Title of compare editor s
h
ould 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 activate wh
e
n SMV
h
as
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-09-05
Martin Fleck
[51
8
9
81]
A
lways
u
s
e sp
e
c
i
alized logic when using Revi
s
ionedU
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-08-31
M
artin Fleck
[519025] Onl
y
consider
references wh
e
n finding stereotyp
e
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-07-21
M
a
r
t
i
n Flec
k
Rela
x
Compa
r
e Consider
a
t
i
ons of I
M
ergeViewerItems
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-07-07
Martin Fl
e
ck
[518979]
Remove context entries with an empt
y
cach
e
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-07-06
Mart
i
n Fleck
[519016] Avoid r
e
pe
a
ted resource
t
raversal wh
e
n resolving
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-07-06
Ma
r
t
in Fleck
[519
0
33] Do not r
e
f
r
e
sh the SMV v
i
ewer after every
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-07-06
Ma
r
t
i
n
Fleck
[519023] Check ca
n
c
el
l
ation le
s
s freq
u
e
ntly in conflict
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-27
Martin
Fleck
[
4
87151] Accept al
l
n
o
n-conflicting chang
e
s fails to
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-27
Mar
t
i
n
Flec
k
[5
1
441
5
] Rel
a
tion
s
h
ips betwee
n
di
f
fs
s
hould be c
a
ched
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-26
Martin Fleck
[5
1
47
6
7] P
r
ovide
p
references to co
n
fi
g
ure com
p
arison
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-26
Martin Fleck
[507157]
C
heck
usage of
I
nputStre
a
ms with
m
oc
k
ito
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-26
Marti
n
F
l
eck
[512677]
Register EMFModelProvider fo
r
n
e
w
Papyrus
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-26
Ma
r
t
i
n
F
l
eck
[51
4
3
8
2
]
Pr
e
-Merge on conflict can l
e
ad
t
o
data lo
s
s
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-06-26
Ma
r
tin Fleck
[514079] Implement
Mirroring:
S
wap l
e
f
t/right side
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-05-09
M
a
rtin
F
leck
[514079] Defau
l
t to
TextMergeViewe
r
resources f
o
r
icons
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-04-26
Ma
r
tin Fle
c
k
[
512677] Long delay to calculate synchronization
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-04-13
Martin Fle
c
k
[515041] Papyrus
profile migration p
r
e
venting regular
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-04-10
Martin Fleck
[512
5
62] Diff/m
e
rge can't handle
m
u
lti
p
le repos
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-01-13
Martin Fleck
[48379
8
] Register
Pap
y
rus item provider for P
a
pyrus
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2017-01-13
Martin Fle
c
k
[48
3
798] In
t
roduce and use context in adap
t
e
r f
a
ctories
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2016-07-25
Mar
t
in Fleck
[497066]
'
P
roblems' tab
shoul
d
not be shown
automa
t
ically
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2016-07-01
Mar
t
in
F
leck
[495259]
A
dd support fo
r
UML profile migration scenarios
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2016-06-07
Martin
Fleck
[493
5
27] Co
r
r
e
ct
c
o
nflict wh
e
n concurrently un
a
pp
l
y
i
ng
.
.
.
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree
2016-06-03
M
arti
n
Fleck
[
495334
]
[Tes
t
ing Framewor
k
] Ancestor not load
e
d correctly
Signed-off-by:
Martin Fleck
<mfleck@eclipsesource.com>
commit
|
commitdiff
|
tree