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
Fix some of the warnings
2015-05-05
Laurent Goubet
Fix some of the warnings
commit
|
commitdiff
|
tree
2015-04-15
Lauren
t
Goubet
Do n
o
t remov
e
r
e
ad-only storag
e
s from comparison scope
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-04-14
L
a
uren
t
Goubet
Introduce
git-
s
pecifi
c
support
to f
i
x
unuseable s
t
orage
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-03-24
Laur
e
nt Go
u
b
et
[460317] Shoul
d
n't use == to compare URIs
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-10
La
u
rent Goubet
Pro
v
ide
cohere
n
t names for th
e
SDK f
e
ature
s
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-02-09
Laur
e
nt Goubet
Chan
g
e feature n
a
mes t
o
more
descr
i
ptive
o
n
es
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2015-01-21
Laurent Goubet
T
his pars
e
r property is no
t
used
b
y the java
i
mplem
e
n
t
ation
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
La
u
rent
G
o
ub
e
t
Use dem
a
ndCreat
e
i
n
stead of explic
i
tly cre
a
ting the
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Go
u
bet
Only care
f
or con
t
ainment proxies w
h
e
n resolving the
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Laur
e
nt Goubet
Don
'
t unload
resources, even f
o
r UML
.
Ju
s
t clear out
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
La
u
rent Goubet
Make
s
ure
t
he factories are not
k
ept around as
s
i
ngle
t
on
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Laurent G
o
u
b
et
Listen to the
c
o
rrect e
x
tension poin
t
f
o
r
the ad
a
pter
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Go
u
bet
Clear all adapters from
t
he compariso
n
when
w
e're done
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
La
u
rent Go
u
bet
Properly release the
c
o
n
t
ributio
n
s we do
t
o the
t
ool
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
L
a
urent Goub
e
t
Never
use DISABLE_NOTIFY an
d
DEF
E
R_ATTACHMENT load
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
L
au
r
ent Goubet
Properly nul
l
out th
e
referenc
e
s
w
e
've set on the proper
t
ies
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-19
Laurent Goubet
Pull
u
p
the
removal of
the team
c
opy acti
o
ns from the
.
.
.
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 structure
viewer
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-11
Laurent Goube
t
pl
a
tform
plugin and http should
n
e
ver be
added to the
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-10
Lau
r
ent Go
u
bet
Properly dispose our
g
roup providers
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-10
Lauren
t
Goubet
L
imit the n
u
m
ber of
URI norm
a
lizations from
t
he UMLLoadOnDem
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-10
L
a
u
rent Goubet
Remove the adapters
we created from
th
e
comparison
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Lau
r
e
nt
Goubet
[437
5
74] P
r
o
perly di
s
pose
of the e
d
i
ting domains
w
e
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
La
u
ren
t
Goubet
Launch
r
e
soluti
o
n o
f
cross-reso
u
rce proxie
s
as s
o
o
n
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laur
e
nt Goubet
C
l
eanup co
m
pa
r
e configurat
i
o
n
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
La
u
rent Goubet
S
t
yle -
false is the de
f
ault value for
b
ooleans
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Lauren
t
G
o
ubet
_all_
listeners are
interested in _all_
f
etching no
t
ifications
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
La
u
re
n
t Goubet
Don't keep the empty group pr
o
vider around
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goubet
Style - properly use the go
o
gle P
r
ed
i
cate
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
L
a
urent Goubet
Rem
o
ve useless compari
s
o
n
f
ield
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
L
a
urent
Gou
b
et
D
ispo
s
e
of the con
t
ent viewers
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laurent G
o
ubet
N
ull out o
u
r undo/redo actio
n
s (
r
efer
e
nce to domai
n
)
commit
|
commitdiff
|
tree
2014-12-09
Laurent Goubet
Reduce
the number
o
f loop
s
from diffe
r
ence group cre
a
t
i
on
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-09
Laurent G
o
u
b
et
Register proxies as we load
the xml instead of itera
t
in
g
.
.
.
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-12-08
Laurent Goubet
Match performa
n
c
e when u
s
i
n
g
only
i
dentifiers
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-21
La
u
rent
G
oubet
Fix javadoc
o
f th
e
EMFModelProvider to reflect current
.
.
.
commit
|
commitdiff
|
tree
2014-11-17
L
a
urent Goubet
The Conflic
t
Merger ranking should be above that o
f
.
.
.
commit
|
commitdiff
|
tree
2014-11-07
L
a
urent G
o
ubet
[449162] Fix Il
l
egalStateExc
e
ption: The re
s
ource set
.
.
.
Also-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-11-07
Laurent Goube
t
Vari
o
u
s AP
I
issues
commit
|
commitdiff
|
tree
2014-11-07
Laure
n
t
Goubet
Merg
e
"[449162] Fix IllegalStateExcept
i
on
:
The resou
r
ce
.
.
.
commit
|
commitdiff
|
tree
2014-11-07
La
u
rent Goubet
Fix the "c
o
py a
l
l non-conflicting"
a
ctions
commit
|
commitdiff
|
tree
2014-11-07
Laurent Goubet
Add mi
s
sing copyrights
commit
|
commitdiff
|
tree
2014-11-07
Laurent Goubet
B
ump versions
and fix new
p
l
u
gins for Mars
M3
commit
|
commitdiff
|
tree
2014-11-04
Laure
n
t Goube
t
Su
p
p
re
s
s w
a
rnings
on diff_
m
atch_patch and relax nu
l
l
.
.
.
commit
|
commitdiff
|
tree
2014-10-10
Laurent
G
oubet
Pre-merge from
E
MF
logical merging
commit
|
commitdiff
|
tree
2014-10-10
Laurent
G
o
ubet
Modi
f
y
merge to han
d
l
e
implications pr
o
perly
commit
|
commitdiff
|
tree
2014-10-08
Laurent Goubet
Optimi
z
e d
i
c
e coefficient storing bigrams withi
n
ints
commit
|
commitdiff
|
tree
2014-10-08
Laurent Goubet
Consider po
t
ent
i
al d
u
plicates in St
r
ing s
i
milarity
commit
|
commitdiff
|
tree
2014-09-30
L
a
u
rent Goubet
Copy all commands didn't work with UML
commit
|
commitdiff
|
tree
2014-08-27
Laurent Goubet
URIConverters cannot r
e
t
u
rn null st
r
eams
commit
|
commitdiff
|
tree
2014-08-25
Laure
n
t Goubet
M
e
rge "[442439] Fix
e
s D
i
ffUtil
.
getSourc
e
List f
o
r moved
.
.
.
commit
|
commitdiff
|
tree
2014-08-22
L
a
u
ren
t
Goub
e
t
F
ix
m
erg
e
-related UI fe
e
dba
c
k o
f
the
Structure viewer
Signed-off-by:
Laurent Goubet
<laurent.goubet@obeo.fr>
commit
|
commitdiff
|
tree
2014-08-20
L
aurent
Goubet
Only merge the 'many' side of an equivalence i
n
case
.
.
.
commit
|
commitdiff
|
tree
2014-07-31
L
a
urent Gou
b
et
M
e
rge
"
[440679] Avoids N
P
E when
p
e
r
fo
r
ming a
move
"
commit
|
commitdiff
|
tree
2014-07-18
L
a
urent Goubet
upd
a
te README
f
or M
a
rs de
v
commit
|
commitdiff
|
tree
2014-07-18
La
u
rent
G
oubet
Avoid
NPE with null monitors
commit
|
commitdiff
|
tree
2014-07-18
Laur
e
nt Goubet
Nev
e
r fa
l
l
b
ack to local data f
o
r r
e
mote sides
.
commit
|
commitdiff
|
tree
2014-07-16
Laurent Goubet
Add Subv
e
rsive su
p
po
r
t to the build and u
p
date site
commit
|
commitdiff
|
tree
2014-07-10
Laurent
Goub
e
t
Al
l
ow cre
a
t
ion of IComparisonSc
o
pes f
r
om
a pr
e
-
c
omputed
.
.
.
commit
|
commitdiff
|
tree
2014-07-10
L
aurent Goubet
properly disp
o
se of the git resources in logical test
.
.
.
commit
|
commitdiff
|
tree
2014-07-10
L
auren
t
Goubet
Add unit tests
f
or the ResourceMappingMerger
commit
|
commitdiff
|
tree
2014-07-08
L
a
urent Gou
b
et
The logical mode
l
should fi
n
d incomi
n
g
cro
s
s-referen
c
e
s
commit
|
commitdiff
|
tree
2014-07-07
Laurent Goubet
pseud
o
conflicts should be co
n
sidered auto-mergea
b
le
.
commit
|
commitdiff
|
tree
2014-07-07
Laurent Goubet
Fi
r
s
t
i
m
ple
m
entation of a r
e
source mapp
i
n
g
me
r
ger
.
commit
|
commitdiff
|
tree
2014-07-01
Laurent
G
oubet
Missing copyright notic
e
commit
|
commitdiff
|
tree
2014-07-01
Laurent
G
o
ubet
Prepare
f
o
r
ResourceMappingMerger
commit
|
commitdiff
|
tree
2014-07-01
Lauren
t
Goubet
Pr
e
par
e
bui
l
d for
Mars
commit
|
commitdiff
|
tree
2014-07-01
Laurent Goubet
B
u
m
p
ver
s
i
o
ns to
3
.
1
.
0 on
master
commit
|
commitdiff
|
tree
2014-07-01
Lau
r
ent G
o
u
be
t
delete legacy
plu
g
in
commit
|
commitdiff
|
tree
2014-07-01
Laure
n
t Goubet
remove lega
c
y (and unbuildable) sysml
s
upport
commit
|
commitdiff
|
tree
2014-06-20
Laurent Goub
e
t
av
o
id
fa
i
lures compa
r
i
n
g files a
t
repository r
o
ot
commit
|
commitdiff
|
tree
2014-06-11
Laure
n
t Goubet
av
o
id infinite looping from git w
h
en resolving fails
commit
|
commitdiff
|
tree
2014-06-03
Laurent
Goubet
various sonar
v
iolat
i
ons fixes
commit
|
commitdiff
|
tree
2014-06-02
Laurent G
o
u
b
et
M
o
d
el
resolv
i
ng
p
refe
r
ence
s
commit
|
commitdiff
|
tree
2014-06-02
L
aur
e
nt G
o
ubet
Add Guava 15 to the accepted
r
ange
commit
|
commitdiff
|
tree
2014-05-23
Lau
r
ent
G
oubet
Fix
r
andom o
c
curences of
resol
v
ing iss
u
es
commit
|
commitdiff
|
tree
2014-05-23
Laurent Goub
e
t
Lim
i
t scop
e
of resource delt
a
react
i
ons in the resolver
commit
|
commitdiff
|
tree
2014-05-21
Lauren
t
Goubet
Merge "Handle cancel user request t
h
rough
pr
o
gress
.
.
.
commit
|
commitdiff
|
tree
2014-05-21
Laurent Goubet
Merg
e
"Add clea
r
m
e
t
ho
d
to Graph"
commit
|
commitdiff
|
tree
2014-05-20
L
a
urent Goubet
try and ha
n
dle
git local revisions during
compari
s
on
commit
|
commitdiff
|
tree
2014-05-20
Laurent Go
u
b
et
"OK" s
t
atus should still
display the co
m
pari
s
o
n
commit
|
commitdiff
|
tree
2014-05-19
Laurent
Go
u
be
t
tempora
r
y impleme
n
t equals
f
or the EMFResourceM
a
p
p
i
ng
commit
|
commitdiff
|
tree
2014-05-14
Laur
e
nt Goubet
ena
b
le pack200
and
include packed artefacts
commit
|
commitdiff
|
tree
2014-05-06
Laurent Goubet
[4
3
4210] IndexOOB whe
n
o
peni
n
g resolver p
r
ferences
commit
|
commitdiff
|
tree
2014-05-06
Laurent G
o
ubet
Us
e
the shar
e
d li
c
e
n
se feature
.
commit
|
commitdiff
|
tree
2014-05-06
Laurent Goubet
adding CBI to al
l
targets
commit
|
commitdiff
|
tree
2014-05-06
Lau
r
ent Goubet
Rationalize
model re
s
olver extensi
o
n
p
o
int and u
p
date
.
.
.
commit
|
commitdiff
|
tree
2014-05-06
Laurent Goubet
m
ove
h
a
s
M
odelT
y
pe out o
f
t
h
e
r
eso
l
ver
commit
|
commitdiff
|
tree
2014-05-05
L
a
urent Goub
e
t
reduce synchroni
z
ation
ove
r
head of m
o
del resolving
commit
|
commitdiff
|
tree
2014-04-17
L
aure
n
t Goubet
sm
a
ll p
e
rformance tweak : avoid multiple
e
Resource
.
.
.
commit
|
commitdiff
|
tree
2014-04-15
Laurent Goube
t
re
m
o
v
e legacy junk in UML2 tests
commit
|
commitdiff
|
tree
2014-04-03
Laurent
G
oubet
fix english
commit
|
commitdiff
|
tree
2014-04-01
Laurent Goubet
Merge "[4
0
6
5
16]
M
an
a
ge
P
aramet
e
riz
e
d Types in Comparis
o
n"
commit
|
commitdiff
|
tree
2014-03-28
L
aurent
G
o
ubet
Merge "Fix typo for Compa
r
e With Each
Other in Dialog
.
.
.
commit
|
commitdiff
|
tree
2014-03-28
Laure
n
t Gou
b
et
Mer
g
e "[4
1
8472] Cannot merge a mov
e
from nestedClassifier
.
.
.
commit
|
commitdiff
|
tree
2014-03-13
Laur
e
nt Goubet
normalize EOLs i
n
the
core
(
second pass)
commit
|
commitdiff
|
tree
2014-03-13
Laure
n
t Goubet
normalize
E
OLs in
t
h
e core (f
i
rst pass)
commit
|
commitdiff
|
tree
2014-03-13
Lau
r
ent Go
u
bet
Mer
g
e "[
4
29441]
E
nable/Di
s
able p
o
s
t
processors
.
"
commit
|
commitdiff
|
tree
2014-03-13
Laurent Goubet
n
o
rm
a
lize EOLs throughout
EMF Co
m
par
e
commit
|
commitdiff
|
tree
2014-03-03
Laurent
Goube
t
bu
l
let list syn
t
a
x
commit
|
commitdiff
|
tree
next