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
[467668] Fix Accept/Reject All buttons behaviour with shared models
2015-05-06
Laurent Goub
e
t
signing issues
commit
|
commitdiff
|
tree
2015-05-06
Laur
e
nt
G
o
u
b
et
si
g
ning
issues
commit
|
commitdiff
|
tree
2015-05-06
La
u
re
n
t Goubet
signing i
s
sues
commit
|
commitdiff
|
tree
2015-05-06
Lauren
t
Goubet
signing is
s
ues
commit
|
commitdiff
|
tree
2015-05-06
Laurent
G
o
u
bet
signi
n
g f
a
ilures
commit
|
commitdiff
|
tree
2015-05-06
L
a
ur
e
nt G
o
ubet
Display prop
e
r labels for the cont
e
nt merge viewer
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-06
Lauren
t
Goubet
Int
r
oduce tests for the UR
I
Conve
r
ter
a
nd our pa
t
h fixing
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-06
L
aurent Go
u
bet
G
it test
s
not launche
d
during
b
uild
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-05
Laurent Goube
t
Merg
e
tool does
n
't
work on logical models
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-05-05
L
a
urent Goubet
Fix some of
t
he warnings
commit
|
commitdiff
|
tree
2015-04-15
L
aurent G
o
ubet
Do not remove read-only
storage
s
from comp
a
rison scope
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-14
Laur
e
nt
Goubet
Introduce git-sp
e
cific support t
o
fix unuseable
s
torage
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-24
La
u
rent Goubet
[460317] Shou
l
dn'
t
use == to compare U
R
Is
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-10
L
a
urent
G
oubet
Provide cohere
n
t names
for th
e
SD
K
f
e
atures
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Laurent Goubet
Ch
a
n
ge
feature names
t
o more
d
escriptive one
s
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-21
Laurent Goubet
This parser property i
s
no
t
used by the java implement
a
tion
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Laur
e
nt Go
u
bet
Use demandCrea
t
e instead of explicitly c
r
e
a
t
ing the
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
L
a
uren
t
Goubet
Only
c
ar
e
fo
r
containment p
r
oxie
s
when resolving the
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Laur
e
nt Goub
e
t
Don'
t
un
l
oad
r
esourc
e
s, even fo
r
UML
.
J
ust clear out
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
Make sure the factor
i
es
are not kept a
r
o
und as singlet
o
n
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Go
u
bet
Liste
n
to the correct extension point for
t
he
a
dapter
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
Clear all adapte
r
s from the comparison when we're done
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
L
aur
e
nt Goubet
Properly
r
e
lease the cont
r
ibutions we
d
o to t
h
e tool
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
Never use DISABLE_NO
T
IFY
a
nd DEFER_ATTACHMENT lo
a
d
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goub
e
t
P
roperly
nu
l
l out t
h
e
reference
s
we've set
o
n the properties
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
La
u
r
e
nt Goub
e
t
P
ull up
t
he removal of the
t
ea
m
copy
actio
n
s fro
m
the
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
Laurent Goubet
D
o
not cr
e
at
e
a
l
l T
r
eeItems of the structure viewer
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
Laurent
G
ou
b
et
platform
p
lugin a
n
d
h
t
tp shou
l
d n
e
v
er be
a
dded to the
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-10
Lauren
t
G
oubet
Properly dispose
o
ur group provid
e
rs
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-10
Laurent Go
u
bet
Limit
the number of
U
RI normalizatio
n
s
from the UMLLoa
d
OnDem
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-10
L
aur
e
nt
G
o
ubet
Rem
o
v
e
the adapt
e
rs we c
r
eated fr
o
m t
h
e
compa
r
ison
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laurent
Goubet
[4
3
7574] Properly disp
o
se
of the editing dom
a
ins we
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goubet
Lau
n
c
h resolution of cross-resource
p
r
oxi
e
s as soon
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goube
t
Clea
n
up com
p
are configur
a
tion
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laur
e
nt Goubet
S
t
yle -
false is the
defau
l
t
v
alue
f
or booleans
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laur
e
nt Goubet
_all
_
listen
e
r
s
a
r
e i
n
terested in
_
all_ fet
c
hin
g
notifica
t
i
ons
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Lauren
t
Go
u
b
e
t
Don't
ke
e
p the em
p
ty group provider ar
o
und
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laurent Gou
b
et
Style - prop
e
r
l
y use
t
he
google Pr
e
dic
a
te
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
L
a
u
rent G
o
u
b
e
t
Remove useless comp
a
ri
s
on fie
l
d
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laur
e
n
t Goube
t
Dispose of the co
n
tent viewers
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laurent
Gou
b
et
N
ull o
u
t
our undo/redo
acti
o
ns (r
e
ference to
domain)
commit
|
commitdiff
|
tree
2014-12-09
L
a
urent Go
u
bet
Red
u
ce the number of loops
f
r
o
m diff
e
rence g
r
o
u
p
c
reation
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Lau
r
e
n
t
Go
u
bet
Register proxies
a
s we
l
oad t
h
e
x
ml instead of iterat
i
ng
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-08
L
au
r
ent Goubet
Matc
h
performance
when
us
i
ng o
n
ly identi
f
iers
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-21
La
u
rent Go
u
bet
Fix ja
v
a
d
oc of the EMFModel
P
r
o
vide
r
to
r
eflect
current
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
Laurent
G
o
ubet
The ConflictM
e
rger
r
anking shoul
d
be above that of
.
.
.
commit
|
commitdiff
|
tree
2014-11-07
Laurent Goubet
[
449
1
62] Fix Illega
l
State
E
xception: The r
e
s
ource
s
et
.
.
.
Also-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-07
Laurent Goubet
Various AP
I
i
s
sues
commit
|
commitdiff
|
tree
2014-11-07
Laur
e
nt Goubet
Mer
g
e
"[449162] Fix Illega
l
S
tateException: The resource
.
.
.
commit
|
commitdiff
|
tree
2014-11-07
L
a
urent Goubet
F
i
x the
"
c
o
py
a
ll non-c
o
nflicting
"
actions
commit
|
commitdiff
|
tree
2014-11-07
Lau
r
e
n
t Goub
e
t
Add
m
issi
n
g
c
opyr
i
ghts
commit
|
commitdiff
|
tree
2014-11-07
Laurent Goubet
B
u
m
p
versi
o
ns and fix new plugins for
M
ars M3
commit
|
commitdiff
|
tree
2014-11-04
Lauren
t
Goubet
Suppress warnings on diff_match_patch and relax nul
l
.
.
.
commit
|
commitdiff
|
tree
2014-10-10
Laurent G
o
u
b
e
t
Pr
e
-merge
from EMF l
o
g
i
cal merging
commit
|
commitdiff
|
tree
2014-10-10
Laurent
Goubet
Modify merge to handle impl
i
catio
n
s proper
l
y
commit
|
commitdiff
|
tree
2014-10-08
L
aurent Goube
t
Opti
m
ize dice coefficient storin
g
bi
g
rams within in
t
s
commit
|
commitdiff
|
tree
2014-10-08
Laurent Goubet
C
onsider pot
e
n
t
ial duplica
t
es in String similarity
commit
|
commitdiff
|
tree
2014-09-30
L
aur
e
nt Goubet
Cop
y
all comm
a
nds didn
'
t work w
i
th UML
commit
|
commitdiff
|
tree
2014-08-27
Laurent Goubet
U
RICo
n
ve
r
ters
c
ann
o
t r
e
turn nu
l
l stre
a
ms
commit
|
commitdiff
|
tree
2014-08-25
Laurent Goubet
Merge "[44
2
439] Fixes Di
f
fUt
i
l
.
getSour
c
eList
for
m
o
ved
.
.
.
commit
|
commitdiff
|
tree
2014-08-22
Laurent Goube
t
Fi
x
m
erge-re
l
a
t
ed U
I
fee
d
back of th
e
Str
u
cture view
e
r
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-20
L
a
u
rent Goube
t
Onl
y
m
erge the '
m
any' side
of an equivalence in ca
s
e
.
.
.
commit
|
commitdiff
|
tree
2014-07-31
Laurent Goubet
Merge "[440
6
79] Avoids NPE when performin
g
a move"
commit
|
commitdiff
|
tree
2014-07-18
Laure
n
t Goubet
update README
f
or Mars de
v
commit
|
commitdiff
|
tree
2014-07-18
Laurent Go
u
b
et
Av
o
id NPE with n
u
ll monitors
commit
|
commitdiff
|
tree
2014-07-18
Laurent Goubet
N
e
ver fall back to
loc
a
l
data for remote si
d
es
.
commit
|
commitdiff
|
tree
2014-07-16
Laure
n
t Goube
t
Ad
d
Subversi
v
e support to the build and u
p
date site
commit
|
commitdiff
|
tree
2014-07-10
Laurent G
o
ubet
Allow creation of IComparisonScopes from
a pre-com
p
u
t
ed
.
.
.
commit
|
commitdiff
|
tree
2014-07-10
L
a
uren
t
Goub
e
t
properly di
s
pose of
t
he git resources in logic
a
l t
e
s
t
.
.
.
commit
|
commitdiff
|
tree
2014-07-10
L
aurent Goubet
Add u
n
it tests for the
R
esour
c
eMappingMerger
commit
|
commitdiff
|
tree
2014-07-08
L
aurent Goubet
The
logical model should find inc
o
ming cross-references
commit
|
commitdiff
|
tree
2014-07-07
Laure
n
t Go
u
bet
pseu
d
o
c
onflicts should be
considered aut
o
-mergeable
.
commit
|
commitdiff
|
tree
2014-07-07
Laurent
Go
u
bet
Firs
t
implementation of a resource mappi
n
g merger
.
commit
|
commitdiff
|
tree
2014-07-01
Laurent Goubet
Missin
g
copyright n
o
tice
commit
|
commitdiff
|
tree
2014-07-01
Laurent
Goubet
P
repa
r
e for Resourc
e
MappingMerger
commit
|
commitdiff
|
tree
2014-07-01
Laurent
Goubet
Prepare build for
Mars
commit
|
commitdiff
|
tree
2014-07-01
Laurent Goubet
Bum
p
version
s
to
3
.
1
.
0 on master
commit
|
commitdiff
|
tree
2014-07-01
Laurent Goubet
delete legacy
plugin
commit
|
commitdiff
|
tree
2014-07-01
L
a
u
rent Go
u
bet
rem
o
v
e leg
a
cy (and unbuilda
b
le) sysml
s
upport
commit
|
commitdiff
|
tree
2014-06-20
Laurent Goubet
avoid failures comparing files at
repository ro
o
t
commit
|
commitdiff
|
tree
2014-06-11
Lau
r
e
nt Goube
t
avoid infinite loo
p
ing from g
i
t when resolving
f
ails
commit
|
commitdiff
|
tree
2014-06-03
Laure
n
t Goub
e
t
various sonar violations
fix
e
s
commit
|
commitdiff
|
tree
2014-06-02
Lau
r
ent Goub
e
t
M
odel resolvin
g
pre
f
erenc
e
s
commit
|
commitdiff
|
tree
2014-06-02
Laure
n
t Goubet
Add Guava 15 to
t
he
a
c
c
ep
t
e
d
r
ange
commit
|
commitdiff
|
tree
2014-05-23
Laurent Gou
b
et
Fix ra
n
d
o
m
occur
e
nces of r
e
solvi
n
g issues
commit
|
commitdiff
|
tree
2014-05-23
Laurent Goubet
Limit sc
o
pe of resourc
e
delta r
e
actions
in th
e
resolv
e
r
commit
|
commitdiff
|
tree
2014-05-21
L
a
ur
e
nt Gou
b
et
Me
r
g
e "Handle cancel user req
u
es
t
thr
o
ugh
p
rog
r
e
s
s
.
.
.
commit
|
commitdiff
|
tree
2014-05-21
Laurent Goubet
Merge
"
Add cl
e
ar method
t
o Graph"
commit
|
commitdiff
|
tree
2014-05-20
L
aurent Goube
t
try and hand
l
e git lo
c
al
revi
s
ions
during
c
omparison
commit
|
commitdiff
|
tree
2014-05-20
Laure
n
t Goubet
"OK" status should still
display
t
he
comparison
commit
|
commitdiff
|
tree
2014-05-19
Laurent
Goub
e
t
t
emporary imp
l
ement equals for the EMFResourceM
a
pping
commit
|
commitdiff
|
tree
2014-05-14
La
u
r
ent G
o
ubet
enable
pack2
0
0 and in
c
lude p
a
cked
artefacts
commit
|
commitdiff
|
tree
2014-05-06
Laurent Goubet
[434210] IndexOOB when o
p
ening resolver pr
f
erences
commit
|
commitdiff
|
tree
2014-05-06
Laurent Goub
e
t
Use the shared license feat
u
re
.
commit
|
commitdiff
|
tree
2014-05-06
Lauren
t
Goubet
adding CBI
t
o all target
s
commit
|
commitdiff
|
tree
2014-05-06
L
aurent Goube
t
Rationalize model resolver
e
x
tension po
i
n
t
and
u
pdate
.
.
.
commit
|
commitdiff
|
tree
2014-05-06
L
a
u
rent Goubet
move ha
s
ModelTyp
e
o
u
t of the resol
v
er
commit
|
commitdiff
|
tree
2014-05-05
Laurent Goub
e
t
reduce synchro
n
izati
o
n overhead of model res
o
lving
commit
|
commitdiff
|
tree
2014-04-17
L
aurent Goubet
sm
a
ll performanc
e
tw
e
ak
: avoid multiple eResource
.
.
.
commit
|
commitdiff
|
tree
2014-04-15
La
u
rent Goubet
remove legacy junk in UML2 tests
commit
|
commitdiff
|
tree
next