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
doc issues - restore packing, remove metadata modification
2015-06-18
Laurent Goubet
doc i
s
s
ues -
r
estore packing, re
m
ove meta
d
ata modification
commit
|
commitdiff
|
tree
2015-06-18
Laurent Goubet
doc i
s
sues - test - Remove norm
a
lize
commit
|
commitdiff
|
tree
2015-06-18
Laure
n
t Goube
t
d
o
c iss
u
e
s
- test - Remove si
g
ning and
packing
commit
|
commitdiff
|
tree
2015-06-05
L
aure
n
t Goubet
P
r
o
per loadin
g
of the prof
i
le
s
and packages from
t
he SRS
commit
|
commitdiff
|
tree
2015-06-05
L
a
urent Go
u
bet
R
estore caching of the lo
g
i
c
al model
commit
|
commitdiff
|
tree
2015-05-06
Laure
n
t
Goube
t
si
g
ni
n
g
issues
commit
|
commitdiff
|
tree
2015-05-06
Laurent Goub
e
t
s
i
gning issues
commit
|
commitdiff
|
tree
2015-05-06
Laurent Goubet
s
i
gnin
g
i
s
s
ues
commit
|
commitdiff
|
tree
2015-05-06
Laurent Goubet
signing
issues
commit
|
commitdiff
|
tree
2015-05-06
L
a
urent Goubet
sign
i
n
g
failures
commit
|
commitdiff
|
tree
2015-05-06
Laure
n
t
G
oubet
Displ
a
y pr
o
per label
s
for the
c
ontent
merge viewer
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-05-06
Laur
e
nt Goubet
Introduce tests for the URIC
o
nve
r
ter
a
nd
o
ur pat
h
f
ixi
n
g
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-05-06
Laur
e
nt Goubet
G
i
t tests not launched during build
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-05-05
Laurent Goubet
Me
r
ge tool doe
s
n't work on logical models
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-05-05
Laurent Goubet
Fix some
o
f the w
a
rnings
commit
|
commitdiff
|
tree
2015-04-15
Laur
e
nt
Goubet
Do not remove re
a
d-only sto
r
ages from c
o
mp
a
ris
o
n scope
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-04-14
Laurent Gou
b
e
t
Introduce git
-
specific support to fix unuseable s
t
orage
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-03-24
La
u
r
ent Goubet
[4
6
0
317] Shouldn't use ==
t
o comp
a
re U
R
I
s
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-02-10
Laurent Goub
e
t
Provi
d
e co
h
erent nam
e
s for the SDK features
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-02-09
L
a
urent Goubet
Chan
g
e
feature names
t
o more descriptive one
s
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2015-01-21
Laur
e
nt Go
u
bet
T
h
is
parser pr
o
perty
i
s n
o
t u
s
ed by
t
he java i
m
p
leme
n
tation
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goub
e
t
Use demandC
r
ea
t
e instead of
e
xp
l
icitly creating the
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
L
a
urent
G
o
ubet
On
l
y
care fo
r
c
o
ntainment proxi
e
s when resolving the
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
Don
'
t unload resou
r
ces
,
e
v
e
n for UML
.
Just c
l
ear ou
t
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
L
aur
e
nt Goubet
M
a
ke su
r
e the factories are not kept around as single
t
o
n
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
L
a
uren
t
Goubet
Lis
t
en to th
e
correct extension point
f
or the ada
p
ter
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
La
u
rent Goube
t
Clear all adapters from
t
he
comparison when
we're d
o
ne
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laur
e
n
t Goubet
Proper
l
y rele
a
se the contribution
s
we
do
to the t
o
ol
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Go
u
b
et
Nev
e
r use DISABLE_NOTI
F
Y
and DEFER_ATTACHMENT load
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laurent
Goubet
Properly nul
l
o
u
t the referenc
e
s we'
v
e
s
et
o
n the properties
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-19
Laure
n
t Goube
t
P
ull up the removal of the team copy
a
ct
i
on
s
from the
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-11
Laurent Goubet
Do not create all
TreeItem
s
of the struct
u
re viewer
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-11
Laurent Goubet
platfor
m
plugin a
n
d
http s
h
ould n
e
ver be added to the
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-10
Laurent Goubet
Prop
e
r
l
y
dispose our group providers
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-10
Laurent Goub
e
t
Limit the n
u
mb
e
r of U
R
I nor
m
al
i
zati
o
ns from the UMLLo
a
dOnDem
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-10
Laurent
Goubet
Remove the
a
dapter
s
we cr
e
ated from
the compariso
n
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Lauren
t
Go
u
b
et
[437574
]
Pro
p
e
rly disp
o
se of t
h
e
e
diting dom
a
ins we
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goubet
Launch res
o
lution of c
r
oss-resource
p
roxies as
soon
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Laur
e
n
t Goub
e
t
Cle
a
nup
c
ompare con
f
igura
t
i
on
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Laurent
Goubet
S
t
yl
e
-
false i
s
the def
a
ul
t
value for boolean
s
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goub
e
t
_al
l
_
listene
r
s are interested in _
a
ll_ fetc
h
ing notificati
o
n
s
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goubet
Don't keep
the empty group provider
a
round
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Laur
e
nt Goubet
St
y
le - proper
l
y use the go
o
gle Predicate
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Laurent
Goubet
Remove usele
s
s comparison fi
e
ld
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
L
auren
t
Go
u
bet
Di
s
pose of the
co
n
tent viewers
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
L
aurent Goubet
Null o
u
t our undo
/
re
d
o ac
t
ions (reference to domain)
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goubet
Red
u
ce the number of loops from d
i
f
f
erence gro
u
p crea
t
i
o
n
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goubet
Register proxies as we l
o
ad
t
he xml
i
nstea
d
of iterating
.
.
.
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-12-08
Laurent
G
o
u
bet
Match
perform
a
nce when using onl
y
identi
f
iers
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-21
La
u
rent Goubet
Fi
x
javado
c
of
the EM
F
Mode
l
Provider
to
r
eflec
t
cu
r
rent
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
Laur
e
nt Goubet
The ConflictMerger ran
k
ing should be above
t
hat
of
.
.
.
commit
|
commitdiff
|
tree
2014-11-07
Laurent Goubet
[449162] Fix IllegalStateExce
p
t
i
on: The re
s
o
urce se
t
.
.
.
Also-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-11-07
Laurent Goube
t
Various API issues
commit
|
commitdiff
|
tree
2014-11-07
Laurent Goubet
Me
r
g
e
"
[449162] Fix IllegalState
E
xc
e
ption: The resource
.
.
.
commit
|
commitdiff
|
tree
2014-11-07
La
u
rent Goubet
Fix the "copy a
l
l no
n
-conflicting" a
c
t
i
ons
commit
|
commitdiff
|
tree
2014-11-07
Laurent Gou
b
et
A
dd missing c
o
pyrights
commit
|
commitdiff
|
tree
2014-11-07
La
u
r
ent Goub
e
t
Bump versions and
fix new plugins
f
or Mar
s
M3
commit
|
commitdiff
|
tree
2014-11-04
Laure
n
t Goubet
Suppre
s
s warnings
o
n di
f
f_match_patch and relax null
.
.
.
commit
|
commitdiff
|
tree
2014-10-10
Laur
e
nt Goubet
Pre-merge from EMF logical
m
e
r
ging
commit
|
commitdiff
|
tree
2014-10-10
Lauren
t
Goubet
Modify merg
e
t
o han
d
le implicati
o
ns properly
commit
|
commitdiff
|
tree
2014-10-08
Laure
n
t
Gou
b
et
Optimize d
i
c
e
c
o
e
fficient storing bigr
a
ms within
i
nts
commit
|
commitdiff
|
tree
2014-10-08
Laurent
Goubet
C
o
nside
r
p
o
tenti
a
l duplicate
s
in String
s
imilarit
y
commit
|
commitdiff
|
tree
2014-09-30
L
a
urent G
o
ubet
Copy all comman
d
s di
d
n
'
t wor
k
with
U
ML
commit
|
commitdiff
|
tree
2014-08-27
Laurent Goubet
URIConvert
e
r
s cannot return n
u
ll streams
commit
|
commitdiff
|
tree
2014-08-25
Laurent Goubet
M
e
rg
e
"[442439] Fixes DiffUti
l
.
getSource
L
ist for
mo
v
ed
.
.
.
commit
|
commitdiff
|
tree
2014-08-22
Laure
n
t Goube
t
Fix merg
e
-related UI feedback
of
t
h
e
S
tr
u
cture
viewer
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2014-08-20
Laurent Goubet
Only merge the 'many' side of an equivalence in
case
.
.
.
commit
|
commitdiff
|
tree
2014-07-31
Laurent Goubet
Merge "[440679
]
Avo
i
ds NPE when pe
r
forming a move
"
commit
|
commitdiff
|
tree
2014-07-18
Laurent G
o
ubet
upda
t
e README
for Ma
r
s d
e
v
commit
|
commitdiff
|
tree
2014-07-18
Laurent Goubet
Avo
i
d
N
PE with
n
ull
m
on
i
tors
commit
|
commitdiff
|
tree
2014-07-18
Laurent Goubet
Never fal
l
ba
c
k to local d
a
ta for remote
sides
.
commit
|
commitdiff
|
tree
2014-07-16
L
a
u
r
ent
Goube
t
Add Subversi
v
e
support to the build and update site
commit
|
commitdiff
|
tree
2014-07-10
Laurent Goubet
Allow creation of ICo
m
pari
s
onScopes fr
o
m
a pre-c
o
mput
e
d
.
.
.
commit
|
commitdiff
|
tree
2014-07-10
Lauren
t
Goubet
properly dispose of th
e
g
i
t re
s
ources
in logi
c
al test
.
.
.
commit
|
commitdiff
|
tree
2014-07-10
Laurent Goubet
A
dd unit te
s
ts for the
ResourceMappingM
e
rge
r
commit
|
commitdiff
|
tree
2014-07-08
L
a
ure
n
t Go
u
b
e
t
T
he logic
a
l model should
find incoming cross-references
commit
|
commitdiff
|
tree
2014-07-07
Lau
r
ent Go
u
b
e
t
pse
u
do
c
onflicts shou
l
d
be considered au
t
o-mergeable
.
commit
|
commitdiff
|
tree
2014-07-07
Laure
n
t Goubet
Firs
t
implem
e
nt
a
tion of a resou
r
ce mapping merger
.
commit
|
commitdiff
|
tree
2014-07-01
Lau
r
ent
G
oubet
Missing copyright noti
c
e
commit
|
commitdiff
|
tree
2014-07-01
Laurent Goubet
Prepare for ResourceMap
p
ingMerge
r
commit
|
commitdiff
|
tree
2014-07-01
L
a
urent Goubet
P
repa
r
e build for Mars
commit
|
commitdiff
|
tree
2014-07-01
Laure
n
t Goube
t
Bu
m
p versions to 3
.
1
.
0
o
n master
commit
|
commitdiff
|
tree
2014-07-01
L
aurent Goub
e
t
delete leg
a
cy plugin
commit
|
commitdiff
|
tree
2014-07-01
Laurent Go
u
bet
remove legacy (and unbuildable) sys
m
l s
u
pport
commit
|
commitdiff
|
tree
2014-06-20
Laure
n
t Goub
e
t
avoid f
a
ilures c
o
mp
a
ring
files a
t
repos
i
tory root
commit
|
commitdiff
|
tree
2014-06-11
Laurent Goub
e
t
avoid
i
nfinite
l
oopin
g
from git when resolving fails
commit
|
commitdiff
|
tree
2014-06-03
L
a
urent Gou
b
et
vario
u
s s
o
nar
v
iolations fixe
s
commit
|
commitdiff
|
tree
2014-06-02
L
a
urent Goubet
Mo
d
el res
o
lving preferen
c
es
commit
|
commitdiff
|
tree
2014-06-02
Laure
n
t Goubet
Add Guava 15 to the
accep
t
ed ran
g
e
commit
|
commitdiff
|
tree
2014-05-23
Laurent Goubet
Fix random occuren
c
e
s
of re
s
olving issues
commit
|
commitdiff
|
tree
2014-05-23
Laurent Goubet
L
imit scope of resource delta reactions in the resolve
r
commit
|
commitdiff
|
tree
2014-05-21
L
a
uren
t
Goube
t
Mer
g
e
"H
a
ndle
c
a
ncel
user re
q
ues
t
through progress
.
.
.
commit
|
commitdiff
|
tree
2014-05-21
Laur
e
nt Go
u
be
t
Merge
"Add clear method to
G
r
a
ph
"
commit
|
commitdiff
|
tree
2014-05-20
Laurent Goubet
try and
h
a
n
dle git local revisi
o
ns during co
m
par
i
s
on
commit
|
commitdiff
|
tree
2014-05-20
Laurent Goubet
"
OK" sta
t
u
s
should st
i
ll display the co
m
p
a
rison
commit
|
commitdiff
|
tree
2014-05-19
L
a
urent
Goub
e
t
temporary
implement equals f
o
r the E
M
F
R
esour
c
e
M
apping
commit
|
commitdiff
|
tree
2014-05-14
Laurent Goubet
enable pack
2
00 and inclu
d
e
p
a
cke
d
artefacts
commit
|
commitdiff
|
tree
2014-05-06
Laur
e
nt G
o
u
b
et
[
434210]
IndexO
O
B
when opening resolver p
r
f
e
rences
commit
|
commitdiff
|
tree
2014-05-06
Laure
n
t
G
o
ubet
U
s
e
t
he shar
e
d
l
i
cense feature
.
commit
|
commitdiff
|
tree
2014-05-06
Laurent Goube
t
add
i
n
g CBI to all targ
e
ts
commit
|
commitdiff
|
tree
next