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
Enable users to merge all conflicts at once through right-click action
2019-05-29
lgoubet
Enable users to merge all conflic
t
s at
o
nce through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
l
goubet
M
erging
s
i
ngl
e
-valued containment chang
e
s
c
an lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lg
o
ubet
Typo
s
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Prevent LCS computa
t
i
o
n when we d
o
not
n
e
ed orderin
g
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoubet
Prevent duplicat
e
insertion points
to
b
e shown in
t
ree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
l
g
oubet
Prevent C
M
V disp
o
sal when use
r
selects m
u
ltip
l
e element
s
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
O
nly add new adap
t
ers
when needed
commit
|
commitdiff
|
tree
2019-04-14
l
g
oubet
Iterate over the
d
iffe
r
e
n
ce
s
instea
d
of
t
he matches
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
P
r
eve
n
t
OutOfMe
m
ory
E
rr
o
r
s from the U
I
when switching CMV
commit
|
commitdiff
|
tree
2019-04-08
lgoub
e
t
Perfor
m
ance - Computing req
u
irements t
i
m
e
s
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
T
he UML tests shouldn't
u
s
e
a cached i
n
stance of EMFCompa
r
e
commit
|
commitdiff
|
tree
2019-04-03
lg
o
ubet
R
estore possibility to
r
emove merg
e
rs from the registry
commit
|
commitdiff
|
tree
2019-03-22
lgoubet
Make sure
w
e hook the
U
I
w
h
e
n users provide a p
r
ec
o
mpute
d
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
l
goubet
Bump EMF Compare to 3
.
3
.
7
in p
r
epar
a
tion
f
or
2019
-
0
6
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Disposin
g
of the comparison shou
l
dn
'
t be done by the
S
MV
commit
|
commitdiff
|
tree
2019-03-04
lgoub
e
t
Avoid
Clas
s
C
a
stExcept
i
o
n whe
n
me
r
gin
g
f
e
ature map changes
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Bu
m
p versions for 3
.
3
.
6 for 2019-03
commit
|
commitdiff
|
tree
2019-02-26
lgo
u
bet
pa
t
ch
ModelGitM
e
rgeE
d
i
torInp
u
t for EGit
5
.
3
.
0 c
o
mpatibility
commit
|
commitdiff
|
tree
2019-02-26
lgoube
t
S
uppress gu
a
va
n
e
sted concatenati
o
ns
commit
|
commitdiff
|
tree
2019-02-11
l
g
oubet
Remov
e
a
c
c
i
dental u
s
e of G
u
av
a
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
SWT
E
xcepti
o
n when switching c
o
mparisons i
n
a
c
ompare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Allo
w
c
l
ients to p
r
ovide
pre-comput
e
d comparisons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
l
g
oubet
Ignore f
a
i
l
ing gi
t
tests for n
o
w
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bump
versions to
3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
l
g
oubet
Use
a
re
l
eased
v
ersion of Sirius
commit
|
commitdiff
|
tree
2018-11-30
lgoubet
[541
7
3
0] Reverts d
5
9c924
d
ue to an
U
I freeze
commit
|
commitdiff
|
tree
2018-06-22
lgou
b
et
bum
p
feature versions
commit
|
commitdiff
|
tree
2018-06-22
lgo
u
b
et
bump versions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
EM
F
Compar
e
i
s
no
l
onger compatible
w
i
th egi
t
< 4
.
2
commit
|
commitdiff
|
tree
2018-06-05
l
g
o
ubet
In
t
r
odu
c
e
t
e
st f
o
r
merges with m
u
ltiple
a
nces
t
o
rs
commit
|
commitdiff
|
tree
2018-03-19
Laurent Goubet
Pro
x
y l
o
ading from the
m
erg
e
tool
commit
|
commitdiff
|
tree
2018-03-16
Laurent
Goube
t
Allow p
r
o
x
y
reso
l
u
t
i
on from the EMF Comp
a
re
conten
t
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laur
e
nt Goubet
Allow
p
roxy
resolution from the EMF Co
m
pare
structure
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goube
t
SMV
action
t
o rev
e
al all di
f
fer
e
nces
i
n conflict with
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Lauren
t
G
o
ubet
Add
a
c
tions
t
o merge ever
y
thing to "
g
et ri
g
ht"
o
r
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Lauren
t
Go
u
b
e
t
No
c
hanges shown when th
e
re
i
s
a
n adde
d
Si
r
i
u
s
d
iagram
commit
|
commitdiff
|
tree
2018-03-13
Laure
n
t
Goubet
Memory
leak fro
m
the EMFModelProvi
d
er
.
cont
e
xtToReso
u
rceMap
p
i
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Lauren
t
Go
u
be
t
Memory leaks
w
hen co
m
paring
Sirius
d
iagrams
commit
|
commitdiff
|
tree
2018-03-13
lgoubet
Remov
i
ng
th
e
subversive integration pl
u
gi
n
s
commit
|
commitdiff
|
tree
2018-03-13
L
aur
e
n
t
Goubet
XMI files are not always mod
e
l
s
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goubet
Memor
y
leak during automati
c
m
e
rge operati
o
ns from
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Lauren
t
Goubet
Don
'
t
return null f
r
om IT
y
pedE
l
ement
.
getName()
.
commit
|
commitdiff
|
tree
2018-03-12
Laurent G
o
ubet
[53
2
069] Inval
i
d logical model
for Synch
r
onize wit
h
.
.
.
commit
|
commitdiff
|
tree
2018-01-30
l
goubet
Bump plugin
and feature versions fo
r
P
h
o
t
o
n
commit
|
commitdiff
|
tree
2018-01-24
lgoub
e
t
Re
m
oving the Pa
p
y
rus plugins and
featu
r
es f
r
om the
.
.
.
commit
|
commitdiff
|
tree
2017-10-09
La
u
rent Goubet
A
PI break in
J
G
i
t 4
.
9 due t
o
t
h
e fix
for bug 517128
commit
|
commitdiff
|
tree
2017-09-08
La
u
rent Goubet
[510420]
Adding m
i
ssi
n
g extension point definit
i
ons
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
L
a
urent Goubet
[51559
1
] Try
and
f
ix random
test failures
commit
|
commitdiff
|
tree
2017-09-07
Laurent Goubet
p
e
rf
o
rma
n
ce plugin issues
commit
|
commitdiff
|
tree
2017-08-31
L
a
u
r
e
nt Goubet
[52
1
358]
documentation for EMFC
o
m
p
areRCPPlug
i
n
missing
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Laurent Goubet
Bump
i
ng versions for Oxygen
.
1
commit
|
commitdiff
|
tree
2017-08-23
Lau
r
ent Goub
e
t
Removing non
f
un
c
tional prof
i
les from
p
om
commit
|
commitdiff
|
tree
2017-08-22
Laurent Goub
e
t
Separate
c
ore &
e
xt
r
a bui
l
ds
commit
|
commitdiff
|
tree
2017-07-07
Laurent Go
u
bet
[518612] F
r
equent CME from
the adapt
e
r factory dispos
a
l
commit
|
commitdiff
|
tree
2017-07-06
Laurent Gou
b
et
U
s
e t
h
e released ve
r
sion of E
G
it
commit
|
commitdiff
|
tree
2017-06-12
Laure
n
t Goubet
"spy"ing is the root cause of a
huge
memory leak
commit
|
commitdiff
|
tree
2017-06-06
Laurent Goub
e
t
Revert "Refactorings to imp
r
ove pe
r
formance of MatchUtil"
commit
|
commitdiff
|
tree
2017-06-06
Laurent Goub
e
t
Revert "Use more efficient
feature look
-
up in Refe
r
enceUti
l
"
commit
|
commitdiff
|
tree
2017-05-11
L
a
u
r
ent Goubet
[516345]
I
nconsiste
n
c
y with
t
he logic
a
l model
r
esolution
commit
|
commitdiff
|
tree
2017-05-11
Laurent Goubet
Co
m
patibili
t
y with guava 21
commit
|
commitdiff
|
tree
2017-05-09
Laurent G
o
ubet
[51
5
039] avoi
d
throwin
g
exceptions during resource
.
.
.
commit
|
commitdiff
|
tree
2017-04-07
Laurent
G
o
u
b
e
t
Bump ve
r
sions for EMF Compar
e
3
.
3
.
1
commit
|
commitdiff
|
tree
2017-04-07
Lauren
t
Goub
e
t
Missin
g
about
.
html in multip
l
e p
l
u
g
in
s
commit
|
commitdiff
|
tree
2017-04-07
Laurent Goub
e
t
Make sure we cannot import unsupported guava version
s
commit
|
commitdiff
|
tree
2017-02-10
L
aure
n
t Go
u
bet
Try a
n
d
give
more memory to
our over
l
y long
tests
commit
|
commitdiff
|
tree
2017-01-11
Laurent Goubet
[509413] Externalize s
t
r
i
ngs for "Expand All" a
n
d
.
.
.
commit
|
commitdiff
|
tree
2016-12-08
L
a
u
re
n
t
Goubet
switch ne
o
n tp to fixe
d
update sites
commit
|
commitdiff
|
tree
2016-11-22
Laurent Gou
b
e
t
Use obeo's
g
ithub inst
e
ad
of axel
'
s
commit
|
commitdiff
|
tree
2016-11-21
Laurent Gou
b
et
Use
tycho 0
.
26
commit
|
commitdiff
|
tree
2016-11-03
Lau
r
ent Go
u
bet
Don't b
u
ild
the upda
t
e site unless it's
using the latest tp
commit
|
commitdiff
|
tree
2016-11-03
Laur
e
nt Goub
e
t
First ve
r
s
ion of an Oxygen
tp
commit
|
commitdiff
|
tree
2016-09-14
Lau
r
e
n
t Goubet
Bump
v
e
r
sions for EMF
Compa
r
e 3
.
3
.
0
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2016-07-15
Laurent G
o
u
bet
[497399] tagged
v
a
l
ues t
o
olti
p
s throw I
A
Es
commit
|
commitdiff
|
tree
2016-07-12
Laurent Go
u
b
e
t
Do not consider
a container
d
ele
t
ion
to confli
c
t with
.
.
.
commit
|
commitdiff
|
tree
2016-07-07
Laurent Goubet
up
d
ate
t
p to f
o
llow
U
ML designer
commit
|
commitdiff
|
tree
2016-06-14
L
aurent
G
o
u
bet
[495961] incomp
a
tibility between log4j 1
.
x
a
n
d
2
.
x
commit
|
commitdiff
|
tree
2016-06-07
L
aurent Goubet
[495586] Disable
XML handler cache to prevent erroneous
.
.
.
commit
|
commitdiff
|
tree
2016-05-30
Laurent G
o
ubet
[4
9
4723] U
s
e
s
afeE
G
et instead of e
G
et
commit
|
commitdiff
|
tree
2016-05-24
Lauren
t
Gou
b
et
[471157] S
t
ackOverflow still
present
on
Siriu
s
di
a
grams
commit
|
commitdiff
|
tree
2016-05-19
Laurent Goubet
Fix loca
l
izati
o
n
f
or
papyrus
support
p
lugin
commit
|
commitdiff
|
tree
2016-02-08
Laurent Goubet
Cope with API cha
n
g
e
s in
Pap
y
ru
s
commit
|
commitdiff
|
tree
2016-01-21
Laurent Goubet
ta
r
g
e
t
pla
t
form for Neo
n
commit
|
commitdiff
|
tree
2015-12-03
La
u
rent Gou
b
et
[48038
8
] Avo
i
d recu
r
sio
n
when loading package
s
or profile
s
.
commit
|
commitdiff
|
tree
2015-12-03
L
aurent G
o
ube
t
[
4
80395] Avoid
c
alling E
c
oreUtil
.
getURI() as much as
.
.
.
commit
|
commitdiff
|
tree
2015-08-18
Laurent Goubet
B
ump
version
for neon M1
commit
|
commitdiff
|
tree
2015-08-18
L
a
u
r
ent Goubet
Cl
o
sing interna
l
pa
c
ka
g
e from API
commit
|
commitdiff
|
tree
2015-07-31
Laurent
G
oube
t
Only mark conflictin
g
files as co
n
flicting
instead
.
.
.
commit
|
commitdiff
|
tree
2015-07-31
Lauren
t
Goubet
Functional
tests for th
e
remo
t
e
r
e
s
olv
i
ng and as
s
ociated
.
.
.
commit
|
commitdiff
|
tree
2015-07-10
Laurent Goubet
Function
a
l
tests f
o
r the threaded model resolving
commit
|
commitdiff
|
tree
2015-06-22
La
u
r
ent Goubet
Ca
c
h
i
n
g - Don'
t
m
i
nimize the
l
o
gical mo
d
e
l eagerly
commit
|
commitdiff
|
tree
2015-06-19
Laure
n
t
Goubet
revert changes to t
h
e doc
p
ublisher
commit
|
commitdiff
|
tree
2015-06-18
Laurent Goubet
restore
p2-plug
i
n, rename we
b
site zi
p
commit
|
commitdiff
|
tree
2015-06-18
L
a
ur
e
n
t Goube
t
doc issues - re
s
tore pac
k
ing, remove metadata
mo
d
if
i
cation
commit
|
commitdiff
|
tree
2015-06-18
L
aurent Goube
t
doc issues - test - Remove normalize
commit
|
commitdiff
|
tree
2015-06-18
Laur
e
nt
G
o
ub
e
t
doc
iss
u
e
s
- test - Remove sig
n
ing and
p
a
cking
commit
|
commitdiff
|
tree
2015-06-05
Laurent Goubet
Pr
o
p
e
r loading of
the profiles and packages from the SRS
commit
|
commitdiff
|
tree
2015-06-05
Laurent Goub
e
t
Restore caching of the logical model
commit
|
commitdiff
|
tree
2015-05-06
La
u
rent
Go
u
b
et
s
igni
n
g issues
commit
|
commitdiff
|
tree
2015-05-06
Laurent Goubet
s
i
gning issue
s
commit
|
commitdiff
|
tree
2015-05-06
L
auren
t
G
o
u
bet
si
g
n
i
n
g
issues
commit
|
commitdiff
|
tree
next