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
[513931] Fix Deadlock in StructureMergeViewer
2017-09-08
A
lexandra Buzila
[51393
1
]
F
i
x Deadl
o
ck in
S
tructureMe
r
geViewe
r
commit
|
commitdiff
|
tree
2017-09-08
Laurent Goubet
[510420] Ad
d
i
ng missing extens
i
on po
i
n
t definitions
.
.
.
commit
|
commitdiff
|
tree
2017-09-08
Martin Flec
k
[
518957] Reuse Se
m
anticUML
C
on
t
entPro
v
ide
r
instan
c
e
.
.
.
commit
|
commitdiff
|
tree
2017-09-08
Ph
i
lip Lan
g
er
Avoid
NP
E
in Ma
t
chUtil
and IOOB in ReferenceChangeMerger
commit
|
commitdiff
|
tree
2017-09-08
Phili
p
L
a
nger
[515581] Make test
p
lug-in
s
av
a
ilab
l
e from the up
d
ate
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
M
ar
t
in F
l
ec
k
[516060
]
O
paque Acti
o
n Body conflict res
o
lution
r
esu
l
ts
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Laurent Go
u
bet
[515591] Try and fix ra
n
dom test failures
commit
|
commitdiff
|
tree
2017-09-07
Martin Fleck
[
5185
7
2]
Naviga
t
abl
e
should use co
n
tent pro
v
ider to
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Mathieu Cartaud
[518760
]
Remove
l
egacy JU
n
it3 ar
t
efacts
commit
|
commitdiff
|
tree
2017-09-07
Mart
i
n
F
leck
[518
9
68] Only traver
s
e and cache necessa
r
y
Pa
p
yrus
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Martin
F
l
e
ck
[518983] Com
p
areInputAdapt
e
r
s
hould cache a
n
cestor
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
M
a
rtin Fleck
[51898
6
]
T
itle of
compare e
d
itor sho
u
ld be computed
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Marti
n
Fleck
[
5
19003
]
Ensur
e
u
n
do/re
d
o
i
s
a
ctivate when SMV has
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
L
a
ure
n
t Go
u
bet
p
e
rfo
r
man
c
e plugin issues
commit
|
commitdiff
|
tree
2017-09-05
Mathi
e
u Cartaud
[
462863] Sta
g
ing Prompt after Re
s
olving Conflicts
commit
|
commitdiff
|
tree
2017-09-05
Martin Fleck
[518981] Always u
s
e specia
l
ized logic when using R
e
visionedU
.
.
.
commit
|
commitdiff
|
tree
2017-08-31
M
a
rt
i
n Fleck
[5
1
90
2
5] Only consider references
wh
e
n finding ste
r
e
otype
.
.
.
commit
|
commitdiff
|
tree
2017-08-31
Laurent Goub
e
t
[521358] documentation for
EMF
C
ompareRCP
P
lugin missing
.
.
.
commit
|
commitdiff
|
tree
2017-08-31
Christ
i
an W
.
Damus
[520105]
[
Tests] Mave
n
e
x
e
cution of Git t
e
sts fails
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
L
aurent Goub
e
t
Bumping
v
ersions for
Oxy
g
en
.
1
commit
|
commitdiff
|
tree
2017-08-23
Laurent Goubet
R
e
m
o
ving
n
o
n functional profiles f
r
om pom
commit
|
commitdiff
|
tree
2017-08-22
Laurent Goubet
Separate
core & extra builds
commit
|
commitdiff
|
tree
2017-07-21
Marti
n
Fleck
Relax C
o
mp
a
r
e C
o
nsiderations of IM
e
r
g
e
View
e
rItems
commit
|
commitdiff
|
tree
2017-07-20
Philip Langer
A
d
d a few mi
s
s
ing lic
e
nse headers
commit
|
commitdiff
|
tree
2017-07-07
Philip Lange
r
Refactorings to improve
perfor
m
ance of Ma
t
chUt
i
l
commit
|
commitdiff
|
tree
2017-07-07
L
a
urent
Goubet
[518612
]
Frequent
C
ME from the adapte
r
fa
c
tory disposal
commit
|
commitdiff
|
tree
2017-07-07
Martin Fleck
[518979
]
R
e
mo
v
e
c
ontex
t
entries
with
an empty ca
c
he
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Mar
t
in Fl
e
ck
[519016]
A
void repea
t
e
d
r
esou
r
c
e
traversal
when r
e
solvin
g
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Martin Fle
c
k
[519033] Do no
t
r
efr
e
sh the SMV viewer
a
fter eve
r
y
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Martin Fleck
[51
9
023] Check ca
n
cellation less
freq
u
entl
y
in conflict
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Ph
i
l
i
p Langer
[516524
]
Use
m
ore ef
f
i
ci
e
n
t feature look-up
in
Re
f
e
r
e
nc
e
Util
commit
|
commitdiff
|
tree
2017-07-06
C
hrist
i
a
n
W
.
Damus
[519261
]
[Oo
m
ph] Setup model pro
b
lems for Oxygen
commit
|
commitdiff
|
tree
2017-07-06
Christia
n
W
.
Damus
[519170] [Checkstyle]
Author forma
t
constraint i
s
too
.
.
.
commit
|
commitdiff
|
tree
2017-07-06
Christian W
.
Damus
[519227] [Che
c
kst
y
le
]
Style errors in oee
.
compare bundle
commit
|
commitdiff
|
tree
2017-07-06
Laurent
Goubet
U
s
e
the
r
e
leased version
o
f
EGit
commit
|
commitdiff
|
tree
2017-06-29
An
t
o
n
io Ca
m
pesi
n
o
Bug 518608 - Duplicated / Mixed Stage not allowed excepti
o
n
.
.
.
commit
|
commitdiff
|
tree
2017-06-27
Martin Fleck
[487151] Accept all non-confl
i
cting ch
a
nges
fai
l
s
to
.
.
.
commit
|
commitdiff
|
tree
2017-06-27
Ma
r
tin Fleck
[514415] Relatio
n
ships between
diffs should be cached
commit
|
commitdiff
|
tree
2017-06-26
Martin
Fleck
[
514767]
P
r
o
v
ide preferences to c
o
nf
i
gure comparison
.
.
.
commit
|
commitdiff
|
tree
2017-06-26
Martin Fleck
[507157
]
Check
u
sage of I
n
p
u
tStreams with mockito
commit
|
commitdiff
|
tree
2017-06-26
Martin F
l
eck
[512677] Regi
s
te
r
EMFModelProvider for new Papyru
s
.
.
.
commit
|
commitdiff
|
tree
2017-06-26
Martin Fleck
[514382] Pr
e
-Merge on conflict can l
e
ad to data loss
commit
|
commitdiff
|
tree
2017-06-26
M
a
r
tin Fleck
[514079
]
Imple
m
ent Mirroring:
S
wa
p
left/rig
h
t
s
ide
.
.
.
commit
|
commitdiff
|
tree
2017-06-12
Laur
e
nt Goubet
"spy"ing is the root cause of a h
u
ge
m
emory l
e
a
k
commit
|
commitdiff
|
tree
2017-06-06
Lau
r
e
n
t Goubet
Revert "Refacto
r
ings to improve perform
a
nce of MatchUtil"
commit
|
commitdiff
|
tree
2017-06-06
Laurent Goubet
Revert "Use more e
f
fici
e
nt feature
l
ook-up in Refe
r
enceUtil"
commit
|
commitdiff
|
tree
2017-06-06
Philip Langer
U
p
date Oxygen
t
arget to new SysML 1
.
1
update site
commit
|
commitdiff
|
tree
2017-05-12
Phili
p
Langer
[5
1
6
508]
C
ache unresolvab
l
e proxies in NotLoadi
n
g
R
e
sourceSet
commit
|
commitdiff
|
tree
2017-05-12
Philip L
a
nger
[
51
6
520]
A
void unnecessary notifications of compar
i
son
.
.
.
commit
|
commitdiff
|
tree
2017-05-11
La
u
re
n
t Goubet
[516
3
45]
I
nconsistency with the logica
l
model resolut
i
on
commit
|
commitdiff
|
tree
2017-05-11
Laurent Goubet
Co
m
pa
t
ibility with guava
21
commit
|
commitdiff
|
tree
2017-05-09
Mar
t
i
n
F
leck
[514079] Defa
u
lt to TextMergeViewe
r
resources fo
r
icons
.
.
.
commit
|
commitdiff
|
tree
2017-05-09
Phi
l
ip La
n
ger
[
5
0
9
9
75] Selection should
be considered for "ne
x
t"
.
.
.
commit
|
commitdiff
|
tree
2017-05-09
Laur
e
nt Goub
e
t
[515039]
a
void throwing
ex
c
e
p
tion
s
duri
n
g re
s
ource
.
.
.
commit
|
commitdiff
|
tree
2017-04-11
Alexandra B
u
zila
[514545]
e
git
.
ui plugin does not
e
xport its pack
a
ges
commit
|
commitdiff
|
tree
2017-04-10
Martin Fleck
[512562]
D
i
f
f
/merge can't handle multiple repos
commit
|
commitdiff
|
tree
2017-04-10
Philip Langer
[508
8
55] Support starting comparis
o
ns from containers
commit
|
commitdiff
|
tree
2017-04-07
Laurent Goubet
Bump
v
er
s
ions for EMF Com
p
ar
e
3
.
3
.
1
commit
|
commitdiff
|
tree
2017-04-07
Stefa
n
Dirix
[507
0
50] Fix conflict mergin
g
w
h
e
n pr
e
-merge
i
s se
t
.
.
.
commit
|
commitdiff
|
tree
2017-04-07
Laurent Goubet
M
i
ssing a
b
out
.
html in m
u
ltiple plugin
s
commit
|
commitdiff
|
tree
2017-04-07
Laurent Go
u
bet
M
a
ke sure we cannot import unsuppor
t
ed guava vers
i
ons
commit
|
commitdiff
|
tree
2016-12-08
Laurent Gou
b
et
sw
i
t
c
h n
e
on tp to f
i
xed upda
t
e sites
commit
|
commitdiff
|
tree
2016-11-22
La
u
re
n
t Gou
b
et
Use obeo's github ins
t
e
ad of axel's
commit
|
commitdiff
|
tree
2016-11-21
Lauren
t
Goubet
Use tych
o
0
.
26
commit
|
commitdiff
|
tree
2016-11-03
L
a
u
re
n
t Gou
b
et
Don't build the updat
e
si
t
e unl
e
ss it's
us
i
ng the latest tp
commit
|
commitdiff
|
tree
2016-11-03
Lauren
t
Gou
b
et
F
i
r
s
t
version
o
f an Oxygen t
p
commit
|
commitdiff
|
tree
2016-07-25
Martin Fleck
[
4
97066] 'Problems' tab should not be shown auto
m
ati
c
ally
.
.
.
commit
|
commitdiff
|
tree
2016-07-25
Alexandra
B
uzila
[494763] - Ste
r
eotypes not di
s
played in S
M
V
commit
|
commitdiff
|
tree
2016-07-12
Laurent
G
o
ube
t
Do not c
o
n
si
d
er
a container deletion
t
o conf
l
ict with
.
.
.
commit
|
commitdiff
|
tree
2016-07-11
Laurent
Delaigue
[
4
97492] Fi
x
NPE in tooltip provi
d
er
commit
|
commitdiff
|
tree
2016-07-07
Laurent Goubet
update tp
t
o follow UML des
i
g
ner
commit
|
commitdiff
|
tree
2016-06-14
L
a
urent Go
u
bet
[
4
9
5
9
6
1
]
inc
o
mpat
i
bilit
y
between log4j 1
.
x and 2
.
x
commit
|
commitdiff
|
tree
2016-05-24
Laurent Go
u
b
et
[471
1
5
7
]
StackO
v
erflow st
i
l
l
present on Sirius diagrams
commit
|
commitdiff
|
tree
2016-05-19
Laurent
G
oubet
F
ix localizat
i
on for papyrus supp
o
r
t
plugi
n
commit
|
commitdiff
|
tree
2016-02-15
Stefan Dirix
[
4
7
39
8
5] Enable comparison dialog in pure
e4
commit
|
commitdiff
|
tree
2016-02-08
Laur
e
nt Go
u
bet
Cope with API changes i
n
Papyrus
commit
|
commitdiff
|
tree
2016-01-21
Laurent Goubet
tar
g
et platfo
r
m f
o
r Ne
o
n
commit
|
commitdiff
|
tree
2015-10-19
A
x
e
l Richard
[
4
75
5
86] Reject
s
ub-diffs of rejecte
d
diffs when ca
s
cading
.
.
.
commit
|
commitdiff
|
tree
2015-08-18
Lau
r
ent Goubet
B
u
m
p version for neon M1
commit
|
commitdiff
|
tree
2015-08-18
L
a
ur
e
nt Goub
e
t
Closing in
t
ernal package from API
commit
|
commitdiff
|
tree
2015-07-31
L
aurent Goubet
Only ma
r
k con
f
licting files as c
o
nflicting inste
a
d
.
.
.
commit
|
commitdiff
|
tree
2015-07-31
L
a
u
r
e
nt Goubet
Func
t
ional tests for th
e
remo
t
e
resolving and a
s
sociat
e
d
.
.
.
commit
|
commitdiff
|
tree
2015-07-15
Axel
Richard
N
e
w EMF Compa
r
e
spec
i
fications plugin
commit
|
commitdiff
|
tree
2015-06-22
Axe
l
R
i
c
ha
r
d
[45
3
408]
Fix SWTException in EMFCSMV#internalRedraw()
commit
|
commitdiff
|
tree
2015-06-22
Ax
e
l Richard
[470396] Fi
x
N
P
E
in CompareTo
o
lBar#setEnabled(b
o
olean)
commit
|
commitdiff
|
tree
2015-06-19
Laurent Goubet
revert
c
hanges
t
o
t
he doc publisher
commit
|
commitdiff
|
tree
2015-06-18
Laurent Gou
b
e
t
restore p2-plugin,
rename webs
i
t
e zip
commit
|
commitdiff
|
tree
2015-06-18
Philip Langer
Refact
o
r
s
the EMFResourceMap
p
in
g
M
erger
commit
|
commitdiff
|
tree
2015-06-18
L
a
u
r
en
t
G
oubet
doc iss
u
es - rest
o
re pac
k
ing, remove metada
t
a modifica
t
ion
commit
|
commitdiff
|
tree
2015-06-18
L
a
urent Goubet
doc issue
s
- test -
R
e
move
n
o
rmalize
commit
|
commitdiff
|
tree
2015-06-18
Lau
r
ent Goubet
doc issues - te
s
t - Remove signing and pa
c
king
commit
|
commitdiff
|
tree
2015-06-18
Axel Richard
[RelEng] Update tycho
f
rom 0
.
21 to 0
.
2
3
commit
|
commitdiff
|
tree
2015-06-18
Axel
R
ichard
[RelEng] Upda
t
e jarsi
g
ner ver
s
i
on from 1
.
0
.
5
t
o 1
.
1
.
2
commit
|
commitdiff
|
tree
2015-06-18
Axel Richa
r
d
Add
new UML DanglingStereoty
p
eAp
p
l
i
cation conc
e
pt
commit
|
commitdiff
|
tree
2015-06-17
Axel Richa
r
d
[
469355] Fix conflict
s
label shows
w
r
ong nu
m
ber
of
.
.
.
commit
|
commitdiff
|
tree
2015-06-08
Axel Richa
r
d
[D
o
c] Update generated qualified ver
s
ion for
w
e
bs
i
t
e
commit
|
commitdiff
|
tree
2015-06-05
L
aurent Go
u
bet
Re
s
tore ca
c
hing of the lo
g
ical model
commit
|
commitdiff
|
tree
2015-05-18
A
xel Richard
[Doc]
U
pdate
u
ser guid
e
commit
|
commitdiff
|
tree
2015-05-06
Laurent Go
u
bet
signi
n
g is
s
u
e
s
commit
|
commitdiff
|
tree
2015-05-06
L
a
urent Goubet
signing
i
ssues
commit
|
commitdiff
|
tree
next