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
Cannot merge added/deleted resources
2019-03-21
lgoubet
Disp
o
si
n
g of the co
m
paris
o
n shouldn'
t
be done by
t
h
e SM
V
commit
|
commitdiff
|
tree
2019-03-04
lgo
u
bet
Avoid
ClassCastE
x
c
e
pti
o
n w
h
en merging feature
m
ap changes
commit
|
commitdiff
|
tree
2019-02-26
l
g
oubet
Bump
v
e
r
s
ions f
o
r 3
.
3
.
6 for
2
019-03
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
p
a
tch ModelGitMergeEditor
I
nput for EGit 5
.
3
.
0 co
m
patibility
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Suppr
e
ss guava nested concatena
t
ions
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Remove accid
e
ntal us
e
o
f
Guava
commit
|
commitdiff
|
tree
2019-02-11
lgou
b
et
SWTException wh
e
n switching comp
a
ri
s
on
s
in a compare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
l
goubet
Al
l
ow clients
t
o
provide pre-computed
comparisons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgoubet
Ignore failing git tests for n
o
w
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Bump versions to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgo
u
be
t
Use a
r
eleased
version
o
f
Sirius
commit
|
commitdiff
|
tree
2018-11-30
lg
o
u
bet
[541730] Revert
s
d59c924 due to a
n
UI free
z
e
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump feature versions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bu
m
p versions
commit
|
commitdiff
|
tree
2018-06-22
lgo
u
bet
EMF Compare is
n
o longer compatibl
e
w
it
h
egit < 4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lgoube
t
Introdu
c
e
t
est
f
or merges
w
i
t
h multiple ancesto
r
s
commit
|
commitdiff
|
tree
2018-03-13
lgoubet
Removing th
e
s
u
bversive in
t
egr
a
tion plugins
commit
|
commitdiff
|
tree
2018-01-30
l
g
oubet
Bump plugi
n
an
d
feature versi
o
ns f
o
r Photo
n
commit
|
commitdiff
|
tree
2018-01-24
lgoubet
R
e
moving
the Papyru
s
plugins and fea
t
ures from the
.
.
.
commit
|
commitdiff
|
tree
2013-07-12
l
g
o
ubet
[410737] preserv
e
order
i
ng even for
e
quivalent differences
.
commit
|
commitdiff
|
tree
2013-01-18
lgoubet
[
3
67475] Take gi
t
specif
i
citi
e
s i
n
to
acc
o
un
t
when resolv
i
ng
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgou
b
et
R
enaming ResourceTraver
s
al into Storag
e
Traversal to
commit
|
commitdiff
|
tree
2012-10-31
lgoub
e
t
Display a proper na
m
e for the references whe
n
t
h
e diff
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
inf
o
rmation r
e
tu
r
ned
if the logical model resolution
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
l
g
oubet
Use the same
ellisi
o
n f
o
r Attribute and refe
r
ence
labels
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
Pr
o
perly display d
i
f
ference that ar
e
not directl
y
refined
commit
|
commitdiff
|
tree
2012-10-22
lgoubet
Prevent
merging towards the g
i
t index (or oth
e
r
r
emote
.
.
.
commit
|
commitdiff
|
tree
2012-10-22
lgoubet
Lower the number of threads : our bottleneck i
s
the
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
When
restru
c
turing th
e
m
a
tch mod
e
l
commit
|
commitdiff
|
tree
2012-10-19
lgo
u
bet
T
his has not
h
ing to do as package visible
commit
|
commitdiff
|
tree
2012-10-19
l
g
o
u
bet
Make
ResourceTraversal, Res
o
urceU
t
il a
n
d Sto
r
ageU
R
IConverter
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgoub
e
t
Load the
r
igh
t
versions of t
h
e distant
f
iles
.
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
The UI shou
l
d use
p
ost pr
o
cesso
r
s
commit
|
commitdiff
|
tree
2012-10-19
l
g
o
ube
t
avoid double scheme
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgoub
e
t
Always p
r
event loa
d
: e
c
ore ten
d
s t
o
l
o
ad new resources
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
lg
o
ub
e
t
Lea
v
e the possibil
i
ty fo
r
sub-classe to not have a
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
lgoubet
Suppre
s
sing unavoidable wa
r
ning
commit
|
commitdiff
|
tree
2012-10-15
lgou
b
et
Com
m
enting, and
r
educing the nesting count
of getD
E
LOriginVa
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
l
gou
b
e
t
Reducing nesting
commit
|
commitdiff
|
tree
2012-10-15
lgoubet
Missing tags
commit
|
commitdiff
|
tree
2012-10-15
lgoubet
Co
m
menting
commit
|
commitdiff
|
tree
2012-10-15
lgoubet
Unus
e
d
f
ield
commit
|
commitdiff
|
tree
2012-10-05
l
g
oube
t
The resolving
call here is qui
t
e c
o
stly
.
Try an
d
only
.
.
.
commit
|
commitdiff
|
tree
2012-10-05
lgoubet
Perf - Avoid dee
p
n
e
sting
of th
e
concatenat
e
d operato
r
s
commit
|
commitdiff
|
tree
2012-10-05
lgoubet
Merging C
e
dric's changes
commit
|
commitdiff
|
tree
2012-10-05
lgoubet
Typo
commit
|
commitdiff
|
tree
2012-10-03
lgou
b
et
"priv
a
te" is "fi
n
al"
b
y definition :)
commit
|
commitdiff
|
tree
2012-10-03
lgou
b
et
u
se
l
ess condition
commit
|
commitdiff
|
tree
2012-10-03
l
goubet
PMD
f
ailed at p
a
rsi
n
g
this
.
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
Sync
h
ronizat
i
on hell
.
The
smart scope still presen
t
e
d
.
.
.
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
P
r
operly r
e
move read-
o
nly resources
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
Use pri
v
ileged act
i
on when t
r
ying to se
t
fields
/
methods
.
.
.
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
W
e'
l
l never need to writ
e
these fields
.
Make them
f
in
a
l
.
.
.
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
logic
a
l
e
rror
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
n
e
ve
r
clo
s
ed str
e
am
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
Adding uml2 support to th
e
update site
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
Trying
t
o activate UML2
t
ests for
th
e
build
commit
|
commitdiff
|
tree
2012-10-03
lgoubet
Fi
x
ing pd
t
w
arning
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
lg
o
ubet
use uml mile
s
t
o
n
e
s
commit
|
commitdiff
|
tree
2012-10-02
lgou
b
e
t
Switch to
2
.
0
.
1
commit
|
commitdiff
|
tree
2012-10-02
lgoubet
add uml2
.
ide
.
ui to the
featur
e
commit
|
commitdiff
|
tree
2012-10-02
lgou
b
e
t
Try and ac
t
ivate the bu
i
ld of
the UML support
commit
|
commitdiff
|
tree
2012-10-02
lgoubet
R
e
move r
e
ad-only
resources from the logica
l
mo
d
el
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
lgoubet
390846 Ease t
h
e customi
z
ation of
the
d
e
f
a
ult match
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
l
g
oube
t
Remove the workaround to build again
s
t J
a
va 5
.
We have
.
.
.
commit
|
commitdiff
|
tree
2012-10-02
lgoubet
3
9
0845 make the FilterCompar
i
sonS
c
ope a little more
.
.
.
commit
|
commitdiff
|
tree
2012-09-29
lgoubet
Missing fi
l
e
fro
m
last com
m
it
commit
|
commitdiff
|
tree
2012-09-29
lgoubet
Do
n
't try a
n
d "
f
ind"
the res
o
urce
s
aft
e
r
loading
.
U
s
e
.
.
.
commit
|
commitdiff
|
tree
2012-09-29
lgoubet
UML specific i
s
s
ue :
s
ome objects do not res
p
e
c
t t
h
e
.
.
.
commit
|
commitdiff
|
tree
2012-09-29
lgo
u
bet
Reduce t
h
e lookup s
c
ope
commit
|
commitdiff
|
tree
2012-09-29
lgoubet
U
s
e direc
t
loo
k
up inste
a
d
of it
e
ration whenever poss
i
ble
commit
|
commitdiff
|
tree
2012-09-29
lgoub
e
t
A
v
oid the use of
MatchUt
i
l
.
getContainer
commit
|
commitdiff
|
tree
2012-09-29
l
g
oubet
find eop
p
osites withou
t
relyi
n
g
on ite
r
ation over t
h
e
.
.
.
commit
|
commitdiff
|
tree
2012-09-27
l
goubet
Compile under Java 5
commit
|
commitdiff
|
tree
2012-09-27
lgoubet
First draft of
t
h
e re
s
o
urce att
a
chment chang
e
me
r
ge
.
.
.
commit
|
commitdiff
|
tree
2012-09-26
lgo
u
bet
Renaming AbstractInputData#loadFr
o
mClass
L
oader (typo)
.
commit
|
commitdiff
|
tree
2012-09-26
l
g
oubet
Still more
pursu
i
ng of loading perfor
m
a
nce
.
commit
|
commitdiff
|
tree
2012-09-26
lgoubet
S
w
it
c
hing back to the
w
or
k
a
round
since 390334 does
.
.
.
commit
|
commitdiff
|
tree
2012-09-26
lgoubet
Try a
g
ain now
t
hat 390334 is
f
i
x
ed
commit
|
commitdiff
|
tree
2012-09-25
lgoubet
Avoid loading and resolv
i
ng twice the
starting poi
n
t
.
commit
|
commitdiff
|
tree
2012-09-25
lgoubet
Comme
n
ting the po
t
entia
l
c
ompil
a
tion
f
ailures
commit
|
commitdiff
|
tree
2012-09-25
lgoub
e
t
Make sure
t
hat the
t
es
t
metamodel honours the "res
o
lve
.
.
.
commit
|
commitdiff
|
tree
2012-09-25
lgoubet
W
orkaround
.
We cannot use <us
e
J
DK>BREE</useJDK> unti
l
.
.
.
commit
|
commitdiff
|
tree
2012-09-25
lgoube
t
Checkstyle
commit
|
commitdiff
|
tree
2012-09-25
lgoubet
Can
w
e u
s
e
th
i
s?
commit
|
commitdiff
|
tree
2012-09-25
lgoubet
There
a
re not ide ui tests passing
yet eith
e
r
.
.
.
commit
|
commitdiff
|
tree
2012-09-25
lgoubet
Di
s
abling
i
de
test
s
until
w
e have
s
ome
t
o includ
e
commit
|
commitdiff
|
tree
2012-09-25
lgoubet
There are no longer "IDE" tests
commit
|
commitdiff
|
tree
2012-09-25
lgoubet
S
w
i
tchi
n
g
b
ack to
tycho
0
.
14
commit
|
commitdiff
|
tree
2012-09-25
lgoubet
oups
commit
|
commitdiff
|
tree
2012-09-25
lgoubet
t
e
sti
n
g again!
commit
|
commitdiff
|
tree
2012-09-25
lgo
u
bet
Can we compile with tycho
0
.
1
5?
commit
|
commitdiff
|
tree
2012-09-25
lgoubet
test
commit
|
commitdiff
|
tree
2012-09-25
lgoubet
Still trying to c
o
mpil
e
with Java 5
commit
|
commitdiff
|
tree
2012-09-25
lgoubet
Try and
f
o
rce tycho to use the 1
.
5
compiler
.
.
.
commit
|
commitdiff
|
tree
2012-09-25
lgo
u
bet
Forc
e
compil
a
t
i
on with j
a
va 5
commit
|
commitdiff
|
tree
2012-09-24
lgo
u
bet
doc & st
y
l
e
commit
|
commitdiff
|
tree
2012-09-24
lgoubet
Moving t
h
e
i
mplementat
i
on
t
o IDE
.
U
I
.
For CVS, we
d
e
p
end on
commit
|
commitdiff
|
tree
2012-09-24
lgoubet
doc
commit
|
commitdiff
|
tree
2012-09-24
lgoub
e
t
doc
commit
|
commitdiff
|
tree
next