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
[527567] Provide support for a general property merge viewer
2018-12-04
l
goubet
I
gnore fa
i
ling git t
e
sts
for now
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bump
v
ersions
to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgou
b
e
t
Use
a released version of Si
r
ius
commit
|
commitdiff
|
tree
2018-11-30
l
g
oubet
[541730
]
Reverts d5
9
c9
2
4 due to a
n
UI freeze
commit
|
commitdiff
|
tree
2018-06-22
l
g
oubet
bump fe
a
t
u
re vers
i
ons
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
b
ump versions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
EMF Compare
i
s
no longer compatible
w
ith
egit < 4
.
2
commit
|
commitdiff
|
tree
2018-06-05
l
goubet
I
n
t
r
od
u
ce test for
m
e
rges with multiple ancesto
r
s
commit
|
commitdiff
|
tree
2018-03-19
Laurent Go
u
bet
P
r
oxy load
i
ng from the merg
e
tool
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goubet
Allo
w
pr
o
xy
r
es
o
lutio
n
fr
o
m the E
M
F
Compare content
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goubet
Allow p
r
oxy resolut
i
on
f
rom the EMF Compare stru
c
t
ure
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goubet
SMV action t
o
reveal all differences i
n
conflict with
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goub
e
t
A
dd actions
t
o
me
r
ge everythin
g
to "get
right" o
r
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goubet
No changes shown when
there i
s
an add
e
d S
i
rius diagram
commit
|
commitdiff
|
tree
2018-03-13
Lau
r
ent G
o
u
b
et
Memory l
e
ak from the EMFMod
e
l
Provider
.
context
T
oRes
o
urceMappi
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goubet
Memory leaks when compar
i
ng
S
ir
i
us diagrams
commit
|
commitdiff
|
tree
2018-03-13
lgoubet
R
emoving the subversiv
e
integration plugins
commit
|
commitdiff
|
tree
2018-03-13
Laurent Go
u
bet
XM
I
files are n
o
t always models
commit
|
commitdiff
|
tree
2018-03-13
Laurent G
o
u
be
t
M
emory leak d
u
ring a
u
to
m
a
tic merge operations from
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laure
n
t Goubet
D
o
n't r
e
turn null f
r
o
m ITypedElement
.
g
etNam
e
()
.
commit
|
commitdiff
|
tree
2018-03-12
Laurent Goubet
[532
0
69] Invalid logical model
f
or Syn
c
h
r
onize
w
ith
.
.
.
commit
|
commitdiff
|
tree
2018-01-30
lgoube
t
B
u
mp plugin and
f
eature
vers
i
ons for Photon
commit
|
commitdiff
|
tree
2018-01-24
lgoubet
Re
m
oving the
P
apyrus p
l
ugins
a
n
d features from the
.
.
.
commit
|
commitdiff
|
tree
2017-10-09
Laurent
Goubet
API break in JGit
4
.
9 due to the fix for bug 517128
commit
|
commitdiff
|
tree
2017-09-08
Laur
e
nt Goubet
[
510420] Adding mis
s
i
n
g
e
xtension point definitions
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Lau
r
ent Goubet
[515591] Try
and fix random test
fail
u
res
commit
|
commitdiff
|
tree
2017-09-07
Laurent Go
u
bet
p
e
r
f
orm
a
n
c
e plugin
issu
e
s
commit
|
commitdiff
|
tree
2017-08-31
Lauren
t
Go
u
bet
[521358
]
documentation for EMFCompa
r
eR
C
P
P
lugin missing
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Laurent
G
oube
t
B
um
p
ing ver
s
ions fo
r
O
xygen
.
1
commit
|
commitdiff
|
tree
2017-08-23
La
u
rent
G
o
ubet
R
e
movin
g
no
n
functional profile
s
fro
m
pom
commit
|
commitdiff
|
tree
2017-08-22
Laurent Goubet
Separate core & extra b
u
i
l
ds
commit
|
commitdiff
|
tree
2017-07-07
Lauren
t
Goubet
[51861
2
] Frequent CME from the adapter facto
r
y dis
p
osal
commit
|
commitdiff
|
tree
2017-07-06
L
a
urent Goubet
Us
e
the r
e
leased ver
s
ion o
f
EG
i
t
commit
|
commitdiff
|
tree
2017-06-12
L
a
urent Goubet
"spy"ing is the r
o
ot
cau
s
e of a huge
m
e
mory lea
k
commit
|
commitdiff
|
tree
2017-06-06
Laur
e
nt Goub
e
t
Rever
t
"Refactorings to improve
per
f
o
rmance of Match
U
til"
commit
|
commitdiff
|
tree
2017-06-06
Laure
n
t Goubet
Revert "Use
m
ore efficient feature
l
o
o
k
-up in Refe
r
enceUtil"
commit
|
commitdiff
|
tree
2017-05-11
Laurent Goubet
[516345] Inconsi
s
tency w
i
th
the logica
l
model r
e
solution
commit
|
commitdiff
|
tree
2017-05-11
Laurent Goube
t
C
ompat
i
bility with gua
v
a 21
commit
|
commitdiff
|
tree
2017-05-09
L
aurent Goubet
[515039] avoid throwing excep
t
ions during res
o
urce
.
.
.
commit
|
commitdiff
|
tree
2017-04-07
Laurent Goube
t
Bump vers
i
o
n
s fo
r
E
MF Compar
e
3
.
3
.
1
commit
|
commitdiff
|
tree
2017-04-07
Laurent Goubet
Missing about
.
h
tml in multiple plugins
commit
|
commitdiff
|
tree
2017-04-07
L
a
u
r
ent
G
oub
e
t
Make
s
ure we cannot import unsupported guava
v
e
rsions
commit
|
commitdiff
|
tree
2017-02-10
Laurent Goubet
T
r
y
an
d
gi
v
e more memor
y
to ou
r
overly long
t
ests
commit
|
commitdiff
|
tree
2017-01-11
L
aure
n
t
G
o
u
bet
[509413]
E
xte
r
nalize
s
trings for "Exp
a
nd Al
l
"
and
.
.
.
commit
|
commitdiff
|
tree
2016-12-08
Laurent Goubet
switch neon tp t
o
fix
e
d up
d
at
e
sites
commit
|
commitdiff
|
tree
2016-11-22
Laurent Goubet
U
s
e
obeo's github instead of ax
e
l's
commit
|
commitdiff
|
tree
2016-11-21
L
aurent Goubet
Use tycho 0
.
26
commit
|
commitdiff
|
tree
2016-11-03
L
aur
e
nt Goubet
Do
n
't bu
i
ld the upd
a
te site unless it's
u
s
i
n
g the latest tp
commit
|
commitdiff
|
tree
2016-11-03
L
aure
n
t Goubet
First vers
i
o
n of an Oxygen
tp
commit
|
commitdiff
|
tree
2016-09-14
Laurent Gou
b
et
Bum
p
ver
s
ions for EM
F
Compare
3
.
3
.
0
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2016-07-15
L
aurent Goub
e
t
[497399] tagged value
s
tooltips thr
o
w IAE
s
commit
|
commitdiff
|
tree
2016-07-12
Laurent G
o
ubet
Do not cons
i
der a c
o
ntainer deletion to conflic
t
with
.
.
.
commit
|
commitdiff
|
tree
2016-07-07
Laurent Goubet
update tp to
follo
w
UML designer
commit
|
commitdiff
|
tree
2016-06-14
L
a
urent
G
oubet
[4
9
5961] incompatib
i
lity betwe
e
n log4j 1
.
x and
2
.
x
commit
|
commitdiff
|
tree
2016-06-07
L
auren
t
G
o
ubet
[4
9
55
8
6] Disa
b
le XML handl
e
r
c
a
che to prevent e
r
r
o
neous
.
.
.
commit
|
commitdiff
|
tree
2016-05-30
Lau
r
ent Goub
e
t
[49472
3
]
U
se safeEGet instead
o
f eG
e
t
commit
|
commitdiff
|
tree
2016-05-24
La
u
r
e
n
t
G
oubet
[
4
71157] Sta
c
kOverflow still prese
n
t
o
n Sirius d
i
agram
s
commit
|
commitdiff
|
tree
2016-05-19
Laurent Goubet
Fi
x
lo
c
al
i
zation for p
a
pyrus supp
o
rt plugin
commit
|
commitdiff
|
tree
2016-02-08
La
u
rent Goubet
Cope wit
h
API ch
a
n
g
es
i
n Papy
r
u
s
commit
|
commitdiff
|
tree
2016-01-21
Laurent
G
o
ubet
target
pla
t
form fo
r
Neon
commit
|
commitdiff
|
tree
2015-12-03
La
u
rent
G
oub
e
t
[
480388] Avoid
r
ecursio
n
wh
e
n l
o
ading p
a
c
kages or profil
e
s
.
commit
|
commitdiff
|
tree
2015-12-03
Laurent Goubet
[4803
9
5] A
v
oid calli
n
g EcoreUtil
.
getU
R
I
()
a
s much as
.
.
.
commit
|
commitdiff
|
tree
2015-08-18
Laurent Gou
b
et
Bump version for ne
o
n M
1
commit
|
commitdiff
|
tree
2015-08-18
Laurent Goubet
Closi
n
g int
e
rnal
p
ackag
e
from API
commit
|
commitdiff
|
tree
2015-07-31
Lauren
t
Goubet
Only mark con
f
licting
f
iles as
c
onf
l
icting
i
nstead
.
.
.
commit
|
commitdiff
|
tree
2015-07-31
L
a
urent Goubet
Fu
n
cti
o
nal tes
t
s f
o
r the
r
emote
resolving and associa
t
ed
.
.
.
commit
|
commitdiff
|
tree
2015-07-10
Laure
n
t Gou
b
et
Functional
t
ests for the thre
a
ded model
r
esolving
commit
|
commitdiff
|
tree
2015-06-22
Laurent
Goubet
Caching - Don't minimize t
h
e logica
l
mode
l
eagerly
commit
|
commitdiff
|
tree
2015-06-19
Laurent Go
u
bet
r
e
vert changes
to t
h
e doc publisher
commit
|
commitdiff
|
tree
2015-06-18
Laurent
G
o
ubet
rest
o
re
p2-p
l
ugin,
r
e
n
a
me webs
i
te zip
commit
|
commitdiff
|
tree
2015-06-18
Laure
n
t Goubet
doc issues - restore p
a
cking,
r
emove metadata m
o
dific
a
tion
commit
|
commitdiff
|
tree
2015-06-18
Laure
n
t Go
u
bet
doc issues - test -
R
emove n
o
rmalize
commit
|
commitdiff
|
tree
2015-06-18
Laurent Goubet
doc issu
e
s
- te
s
t - Remove signing and p
a
c
k
i
ng
commit
|
commitdiff
|
tree
2015-06-05
Laurent G
o
ubet
Proper lo
a
di
n
g o
f
the pro
f
i
l
es and pa
c
kages
f
rom t
h
e
S
RS
commit
|
commitdiff
|
tree
2015-06-05
Laurent Goubet
Restore c
a
ching of the
logical model
commit
|
commitdiff
|
tree
2015-05-06
Laurent Goubet
s
i
g
ning issues
commit
|
commitdiff
|
tree
2015-05-06
Laurent Goubet
si
g
ni
n
g i
s
sues
commit
|
commitdiff
|
tree
2015-05-06
La
u
r
ent Goubet
signin
g
issues
commit
|
commitdiff
|
tree
2015-05-06
La
u
rent Goubet
si
g
n
ing is
s
ues
commit
|
commitdiff
|
tree
2015-05-06
L
aure
n
t Goubet
si
g
ning
f
a
ilu
r
e
s
commit
|
commitdiff
|
tree
2015-05-06
L
aure
n
t G
o
ubet
D
i
s
p
lay proper l
a
b
e
ls for the content merge
viewer
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-05-06
Lauren
t
G
oub
e
t
Introduce tests
fo
r
the URIConverte
r
and our path fixin
g
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-05-06
Lauren
t
G
o
ube
t
Git te
s
ts not launche
d
dur
i
ng build
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-05-05
Laurent Goubet
Merge tool doesn't wor
k
on
logical models
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-05-05
Laurent Go
u
b
e
t
Fix some of
t
he warnings
commit
|
commitdiff
|
tree
2015-04-15
Laur
e
nt G
o
ubet
D
o not remove
r
ead-only
storag
e
s from comparison scope
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-04-14
Laurent Goubet
Introduce
g
i
t
-
s
pe
c
ific s
u
pport
to fix unuse
a
b
l
e
storage
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-03-24
Laure
n
t Goubet
[460317] Shouldn't
u
s
e == to compa
r
e
U
R
Is
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-02-10
Laurent Goubet
Provi
d
e c
o
herent names for the SDK f
e
at
u
res
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-02-09
Laurent G
o
ubet
Change fea
t
u
re names
t
o more descri
p
tive ones
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-01-21
L
aurent Goubet
This parser property is not used by the java i
m
plem
e
ntation
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
Use deman
d
C
r
eate instead
o
f explicitly crea
t
ing the
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
Only ca
r
e for containment proxies when resolv
i
ng
t
he
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
L
a
urent Goubet
Don't unload resources,
ev
e
n for UML
.
Just
c
lear out
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
Make
sur
e
the factories are
n
ot kep
t
aro
u
n
d as singleton
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
Lis
t
en
to th
e
c
o
rr
e
c
t
ext
e
n
s
ion poin
t
for t
h
e adapt
e
r
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
C
l
ear all adapter
s
f
rom the
c
o
mp
a
ris
o
n when we're
d
o
n
e
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
Properly release th
e
co
n
tributi
o
ns
w
e do to the t
o
o
l
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
Never use DISABLE_NOTI
F
Y and
DEFER_ATTACHMENT load
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Lauren
t
Goubet
Proper
l
y n
u
ll out the referen
c
e
s
w
e
've set on t
h
e properties
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
next