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
Restore caching of the logical model
2015-06-08
Lauren
t
Goube
t
Re
s
tore caching
of
the logical model
commit
|
commitdiff
|
tree
2015-05-06
Laurent Goubet
s
ignin
g
issues
commit
|
commitdiff
|
tree
2015-05-06
L
aurent Go
u
bet
signing issues
commit
|
commitdiff
|
tree
2015-05-06
Laurent Goubet
signing issues
commit
|
commitdiff
|
tree
2015-05-06
Laurent G
o
ub
e
t
signing
iss
u
es
commit
|
commitdiff
|
tree
2015-05-06
L
a
u
rent Goube
t
s
igning failures
commit
|
commitdiff
|
tree
2015-05-06
L
a
ure
n
t Goubet
D
isplay
p
ro
p
er
labe
l
s for the content merge v
i
ewer
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-05-06
Laurent Goub
e
t
Introduce tests for the U
R
IConverter and ou
r
path f
i
xing
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-05-06
Laurent Goubet
Git
tests not launched
during build
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-05-05
Laurent Goubet
Merge tool doesn't work on logical models
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-05-05
Laurent Goub
e
t
Fix
some
of the warnings
commit
|
commitdiff
|
tree
2015-04-15
Laurent Goube
t
Do
not remove read
-
only st
o
r
a
ges from compari
s
on
scope
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-04-14
Lau
r
en
t
Goubet
I
n
troduce g
i
t-speci
f
ic
s
u
pport to fi
x
un
u
seable storage
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-03-24
Laurent Goubet
[460317] Shouldn't
u
se == to co
m
pa
r
e URIs
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-02-10
Laurent
G
o
u
be
t
P
rovide co
h
e
rent names fo
r
the SD
K
f
eatures
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-02-09
L
a
urent Goubet
Change
f
eat
u
re names to m
o
re des
c
riptive ones
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-01-21
Laurent Gou
b
et
This parser propert
y
is not used by the j
a
v
a
implementation
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laurent
Goubet
Use demandCr
e
ate instead of explicitly creating t
h
e
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laur
e
nt Goubet
Only care for cont
a
inm
e
nt p
r
oxies when resolving the
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
L
a
ur
e
n
t
Goubet
Don't unload resources, eve
n
for
UML
.
Just c
l
e
ar
o
u
t
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Lau
r
e
n
t Goubet
Make sure the factorie
s
are not kep
t
around as singleton
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laurent
G
oub
e
t
Listen to th
e
cor
r
ec
t
exte
n
s
i
on
point fo
r
the adapt
e
r
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
C
lear
all
a
dapters from the compari
s
on
w
hen we're done
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
L
a
urent Go
u
bet
Prop
e
rly release th
e
contr
i
butions we do to the
tool
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Go
u
b
e
t
Never use DISABLE_
N
OTIFY
and DEFER
_
ATTACHMENT load
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
Prope
r
ly nul
l
out t
h
e references we've set on
the
properties
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
L
aurent Goube
t
Pu
l
l up the removal of
th
e
team copy
acti
o
ns
from t
h
e
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-11
Laurent Goubet
Do not create
all Tr
e
eItems of the st
r
ucture viewer
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-11
Laurent Goub
e
t
p
latform p
l
u
g
i
n
and
h
t
t
p should never b
e
adde
d
to the
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-10
Laur
e
nt Goubet
Properl
y
dis
p
ose
o
ur group pr
o
viders
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-10
Laurent
Goube
t
L
imit th
e
numb
e
r of
U
RI normalizations fr
o
m
t
he
U
MLLoadOnDem
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-10
Laurent
Goubet
R
e
move
the
ad
a
pt
e
rs
w
e create
d
from the
c
omparison
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Laurent Go
u
bet
[
4
3
7
5
74] Properly d
i
spose of
the
e
d
iti
n
g doma
i
ns we
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
L
aurent Goubet
Launch resol
u
tion of cro
s
s-
r
eso
u
rce proxies as s
o
on
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goubet
C
l
e
a
nup compa
r
e configuration
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
L
a
ur
e
nt Goube
t
Style - f
a
lse is the default
v
alu
e
fo
r
booleans
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goubet
_
all_ listeners are in
t
ere
s
te
d
in _all_ f
e
tch
i
ng no
t
ifications
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
La
u
r
e
n
t Goubet
D
on't
keep the empty grou
p
provider ar
o
und
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Lauren
t
Goubet
S
t
y
le - properly use the google
Pr
e
d
icate
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Laure
n
t G
o
ubet
R
emove
useless comparison field
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Lau
r
e
nt
G
oube
t
Dispose of the c
o
ntent viewers
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
La
u
r
e
nt Goubet
Null out
o
u
r
undo/redo action
s
(re
f
erence to domain)
commit
|
commitdiff
|
tree
2014-12-09
Laure
n
t Goub
e
t
Red
u
c
e th
e
number of loops from differ
e
nc
e
group
c
reation
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Laurent
G
oubet
Register
proxie
s
as we load
the xml inst
e
ad of iterating
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-08
Laurent Goubet
Match
p
erf
o
rmance
w
h
en
u
sing only
i
dentifiers
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-21
Laurent Goubet
Fix javadoc of
t
h
e EMFModelProvider to ref
l
ect cu
r
rent
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
Lau
r
e
n
t Goub
e
t
The ConflictMerger ra
n
king s
h
ould be ab
o
ve that of
.
.
.
commit
|
commitdiff
|
tree
2014-11-07
Lau
r
e
n
t Gou
b
et
[449162] Fix IllegalStateException:
T
he resource set
.
.
.
Also-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-07
Laur
e
nt Goubet
Various API issues
commit
|
commitdiff
|
tree
2014-11-07
Laurent
Goubet
Me
r
g
e "[449162]
Fix Ill
e
galStateExce
p
tion: Th
e
resource
.
.
.
commit
|
commitdiff
|
tree
2014-11-07
Laure
n
t
G
oube
t
Fi
x
the "copy
all no
n
-conflict
i
ng
"
actions
commit
|
commitdiff
|
tree
2014-11-07
L
aurent
Goubet
Add mis
s
ing
copyrights
commit
|
commitdiff
|
tree
2014-11-07
L
aurent Goubet
Bump ver
s
io
n
s and fix new plugins for Mars M3
commit
|
commitdiff
|
tree
2014-11-04
Laur
e
n
t
G
oubet
Suppre
s
s w
a
rnings on dif
f
_match_patch
a
nd
r
elax nu
l
l
.
.
.
commit
|
commitdiff
|
tree
2014-10-10
L
aur
e
nt Goubet
Pre-merge from EM
F
logical merging
commit
|
commitdiff
|
tree
2014-10-10
Laurent Goubet
Modify merge to handle implicat
i
ons properly
commit
|
commitdiff
|
tree
2014-10-08
L
aurent Goubet
Optimiz
e
d
i
ce coefficient stori
n
g bigrams within
ints
commit
|
commitdiff
|
tree
2014-10-08
Lau
r
ent
Goubet
Consi
d
e
r pote
n
t
i
al du
p
licates in St
r
in
g
si
m
ilarity
commit
|
commitdiff
|
tree
2014-09-30
Laurent Goube
t
Copy all commands
didn't work wit
h
UM
L
commit
|
commitdiff
|
tree
2014-08-27
L
au
r
en
t
Gou
b
et
URI
C
onverters
cann
o
t ret
u
rn null strea
m
s
commit
|
commitdiff
|
tree
2014-08-25
L
a
uren
t
Goubet
Merge "[4424
3
9] F
i
xe
s
DiffUtil
.
getSo
u
rceList for
moved
.
.
.
commit
|
commitdiff
|
tree
2014-08-22
Laur
e
n
t
Goubet
Fix
merg
e
-related U
I
feedback of th
e
Structure viewer
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-08-20
Laurent Goubet
Only merge the '
m
a
n
y' side
o
f an eq
u
iv
a
lence in
case
.
.
.
commit
|
commitdiff
|
tree
2014-07-31
L
a
urent Gou
b
et
Merge
"[4406
7
9] Avoids NPE whe
n
performing a mo
v
e"
commit
|
commitdiff
|
tree
2014-07-18
L
a
u
re
n
t G
o
ubet
update README
for Mars de
v
commit
|
commitdiff
|
tree
2014-07-18
L
aurent Goubet
Avoid NPE with null moni
t
ors
commit
|
commitdiff
|
tree
2014-07-18
Laurent Goub
e
t
Never fall back to local da
t
a for rem
o
te sides
.
commit
|
commitdiff
|
tree
2014-07-16
Laurent
Go
u
bet
Add Subv
e
rsive support to the build and update site
commit
|
commitdiff
|
tree
2014-07-10
Laurent
G
o
u
bet
Allo
w
cre
a
tion of ICompa
r
is
o
nScop
e
s
from
a
pre-computed
.
.
.
commit
|
commitdiff
|
tree
2014-07-10
Laurent Goubet
properly dispose o
f
the
git re
s
ources in logical te
s
t
.
.
.
commit
|
commitdiff
|
tree
2014-07-10
Laur
e
nt Goubet
Add u
n
it
t
es
t
s for
the ResourceMappingMerger
commit
|
commitdiff
|
tree
2014-07-08
Laurent Goub
e
t
The logical model should fin
d
incoming cros
s
-re
f
er
e
nc
e
s
commit
|
commitdiff
|
tree
2014-07-07
Laurent
Goube
t
pseudo
c
onflic
t
s should be considered aut
o
-m
e
rgea
b
le
.
commit
|
commitdiff
|
tree
2014-07-07
L
a
u
rent
G
oubet
F
irst
i
mplement
a
tion of a
r
e
s
ource mapp
i
ng me
r
ge
r
.
commit
|
commitdiff
|
tree
2014-07-01
Lau
r
ent Goube
t
Mi
s
sing copyrig
h
t
notice
commit
|
commitdiff
|
tree
2014-07-01
Lauren
t
Goubet
Prepare for ResourceMappi
n
gMerger
commit
|
commitdiff
|
tree
2014-07-01
Laurent Goub
e
t
Prepare build fo
r
Mars
commit
|
commitdiff
|
tree
2014-07-01
L
aurent
Goubet
B
ump
versions to 3
.
1
.
0
on mast
e
r
commit
|
commitdiff
|
tree
2014-07-01
La
u
rent
G
oub
e
t
delet
e
legacy plu
g
in
commit
|
commitdiff
|
tree
2014-07-01
Laurent Goubet
remove legacy (and unbuilda
b
le) sysml su
p
port
commit
|
commitdiff
|
tree
2014-06-20
Laure
n
t Goubet
avoid
failures comparing
files at
r
e
p
ository root
commit
|
commitdiff
|
tree
2014-06-11
L
a
ur
e
nt Go
u
bet
avoid infinite looping from
g
it when
r
e
so
l
ving fails
commit
|
commitdiff
|
tree
2014-06-03
Laurent Go
u
bet
various sonar violations fixe
s
commit
|
commitdiff
|
tree
2014-06-02
Laurent
G
oubet
Mo
d
el re
s
olving prefere
n
ces
commit
|
commitdiff
|
tree
2014-06-02
La
u
rent Goub
e
t
A
d
d
Guava
1
5 to the accepted
range
commit
|
commitdiff
|
tree
2014-05-23
L
a
u
r
ent Goubet
F
i
x random occurences of
resol
v
ing issues
commit
|
commitdiff
|
tree
2014-05-23
Laurent Goubet
Li
m
it scop
e
of
resource delta
react
i
ons in t
h
e resolver
commit
|
commitdiff
|
tree
2014-05-21
Laurent G
o
ubet
Merge "Hand
l
e cancel us
e
r
request through
progres
s
.
.
.
commit
|
commitdiff
|
tree
2014-05-21
Laurent Goubet
M
e
r
g
e "Add clear m
e
thod to Graph"
commit
|
commitdiff
|
tree
2014-05-20
L
aurent Goubet
t
r
y
and handle git local
r
evisions during comp
a
rison
commit
|
commitdiff
|
tree
2014-05-20
La
u
re
n
t
Goubet
"OK" status s
h
ould st
i
ll dis
p
l
a
y the
c
omparison
commit
|
commitdiff
|
tree
2014-05-19
Lauren
t
Goube
t
temporary
implement equals for
the EMFResourceMapping
commit
|
commitdiff
|
tree
2014-05-14
Laurent Goube
t
enable pack200 and in
c
lude pa
c
ked artef
a
c
t
s
commit
|
commitdiff
|
tree
2014-05-06
Laurent Goubet
[434210
]
Index
O
OB when o
p
ening resolve
r
prfe
r
ences
commit
|
commitdiff
|
tree
2014-05-06
Laurent Goubet
Use the
share
d
lic
e
nse feature
.
commit
|
commitdiff
|
tree
2014-05-06
Laurent
Go
u
bet
adding CBI to all tar
g
ets
commit
|
commitdiff
|
tree
2014-05-06
Lau
r
en
t
Goubet
Rational
i
ze mo
d
el resolve
r
e
x
tensi
o
n point and upd
a
te
.
.
.
commit
|
commitdiff
|
tree
2014-05-06
Laurent Gou
b
et
move h
a
s
M
ode
l
Type out of
the
resolver
commit
|
commitdiff
|
tree
2014-05-05
Laurent Goubet
reduce s
y
nch
r
on
i
z
a
ti
o
n ove
r
head
o
f
m
odel resolving
commit
|
commitdiff
|
tree
2014-04-17
L
aurent
G
ou
b
et
small performanc
e
twea
k
:
avoid multiple eResource
.
.
.
commit
|
commitdiff
|
tree
next