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
Index issue when merging non-unique attributes' elements
2019-09-06
lgoubet
I
n
d
e
x
i
s
s
u
e when m
e
rging non-unique attributes'
elements
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Diffs
dependi
n
g
on ps
e
udo-conflicts do not reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
M
O
VE difference
s
also need
t
o take in
t
o
a
c
c
o
unt the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Inacc
u
rate
c
onfli
c
t d
e
tection for moves in non-containment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgo
u
b
e
t
Moves
w
ith n
o
n-unique values and ad
d
i
tion/delet
i
on
s
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoub
e
t
On
l
y MO
V
E d
i
f
f
s
need to be ignore
d
when computing th
e
LCS
commit
|
commitdiff
|
tree
2019-09-04
l
g
oubet
Conflict d
e
tec
t
ion on index changes must
take
FeatureFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Ma
k
e sure
t
he U
I
won't t
r
y to
comp
u
te t
h
e LCS f
o
r huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
T
h
e "accep
t
/reject" all
non
-
c
o
nflicti
n
g action s
h
ouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lg
o
ubet
Fix dif
f
, co
n
fli
c
t de
t
e
c
tion and
m
ergi
n
g of non-uniq
u
e
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lg
o
u
b
et
Potential
o
u
t
of bou
n
ds exception
commit
|
commitdiff
|
tree
2019-08-27
lgou
b
et
Compatibili
t
y
w
ith jgit 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
P
erform
a
nce
-
use
D
i
ffCrossRefer
e
ncer wh
e
n possible
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
regressio
n
- right-click actions on single diff
s
elections
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoub
e
t
Open SMV
A
PI to
a
ll
o
w im
p
l
e
menters to
a
ccess the raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Prevents exceptions from bei
n
g
thro
w
n
f
rom t
h
e view
e
r
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
g
o
u
bet
Performance - use stream
s
instead of guava itera
t
ions
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
goubet
Pe
r
f
o
rmance - remove u
s
eles
s
guava tra
n
s
f
ormation
commit
|
commitdiff
|
tree
2019-07-17
lgoub
e
t
Fix detection of
p
se
u
do conflicts on single-valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
g
o
u
bet
Reg
r
es
s
i
o
n on the group/match
right-cl
i
c
k act
i
ons i
n
SMW
commit
|
commitdiff
|
tree
2019-07-16
lgo
u
bet
Prop
e
rly d
e
scribe
wh
a
t
t
h
e
confli
c
t resolving actions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
e
t
Ad
d
S
t
ru
c
t
ure
M
ergeViewe
r
custo
m
izat
i
o
n
options
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Shortcut the UMLPostProces
s
or's
s
ubs
e
t impl
i
cations
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
l
g
oubet
Prevent NPE f
r
om overrid
e
n Resour
c
e implementations
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
e
t
I
g
nore "or
i
g
i
nalTa
r
g
etObjects" from t
h
e EMF Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lg
o
u
bet
Bump
v
ersions to
3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgoub
e
t
Adapt
t
ests to EGit change of behavior
commit
|
commitdiff
|
tree
2019-05-29
lgoube
t
Enable user
s
to merge all conf
l
icts at on
c
e
through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Mergi
n
g s
i
ngle-valued contai
n
m
e
nt
c
hanges can
l
ead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
l
g
o
u
be
t
T
ypos
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Pre
v
en
t
LCS c
o
mputat
i
o
n w
h
en we do not need ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
l
g
oubet
P
r
event duplicat
e
insertion poin
t
s
t
o be shown i
n
tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgo
u
bet
Prev
e
nt CMV di
s
posal when
use
r
selects multiple el
e
m
e
nts
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
Only ad
d
new adapter
s
w
hen
n
eeded
commit
|
commitdiff
|
tree
2019-04-14
lg
o
ubet
I
tera
t
e over
the differences in
s
tead of the matches
commit
|
commitdiff
|
tree
2019-04-09
lgoube
t
Prevent
O
utOf
M
em
o
ryErrors f
r
om th
e
UI
w
hen switc
h
ing CMV
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
Perfor
m
ance - Co
m
puting requir
e
ments times
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
The UML tests shouldn'
t
use
a cach
e
d instance
of EMFCompare
commit
|
commitdiff
|
tree
2019-04-03
lg
o
u
bet
Resto
r
e p
o
ssibility to remove
m
ergers from the reg
i
st
r
y
commit
|
commitdiff
|
tree
2019-03-22
lgou
b
et
Make
s
ure we hook
th
e
UI w
h
en user
s
pr
o
vide a prec
o
mputed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoub
e
t
Bump E
M
F Compare to 3
.
3
.
7 in
p
r
eparation f
o
r 2019-06
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Disposing of
the com
p
aris
o
n shouldn't be
don
e
by the SMV
commit
|
commitdiff
|
tree
2019-03-04
lgoube
t
A
v
oid ClassCastExc
e
ption
w
h
en
m
erging featu
r
e m
a
p changes
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Bump ve
r
s
ions for 3
.
3
.
6
for 2019-03
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
patch Mod
e
lGit
M
er
g
e
Edito
r
Input for EGit 5
.
3
.
0 com
p
ati
b
ility
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Suppress guava nested concatenation
s
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Remove acciden
t
al
u
se o
f
Gu
a
v
a
commit
|
commitdiff
|
tree
2019-02-11
lgou
b
et
S
WTException
w
hen sw
i
tc
h
ing comparisons
in a compare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Allow c
l
ients to
p
rovide pre-computed
compa
r
is
o
ns to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgoubet
Ign
o
r
e
failing git
t
e
sts fo
r
now
commit
|
commitdiff
|
tree
2018-12-03
lgoube
t
Bump versions
to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
U
s
e
a
rele
a
sed ve
r
sion of
Sirius
commit
|
commitdiff
|
tree
2018-11-30
lgoubet
[541730] Reverts d59
c
924
d
u
e
t
o
an UI freeze
commit
|
commitdiff
|
tree
2018-06-22
lgou
b
et
bu
m
p feature v
e
r
sions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bump versi
o
ns
commit
|
commitdiff
|
tree
2018-06-22
l
goub
e
t
E
M
F Compare i
s
no
longer compatible
w
ith egi
t
<
4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lg
o
ubet
Introduce test for merg
e
s with multiple
a
n
c
estors
commit
|
commitdiff
|
tree
2018-03-19
Laure
n
t Goubet
Proxy
loading from the mer
g
e tool
commit
|
commitdiff
|
tree
2018-03-16
Laure
n
t Goubet
Allow
p
roxy
r
e
s
ol
u
tio
n
from the EMF Compa
r
e co
n
tent
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goubet
A
l
low pr
o
xy resolution from the
E
MF Compare str
u
cture
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goube
t
SMV action
t
o
reveal al
l
d
i
ffer
e
nces in conf
l
i
c
t with
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Lau
r
ent Gou
b
et
A
dd actions
t
o me
r
ge everything to "get r
i
g
ht" or
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goub
e
t
No changes shown
w
h
e
n
t
h
ere is an ad
d
ed Sirius d
i
agra
m
commit
|
commitdiff
|
tree
2018-03-13
Lau
r
ent Go
u
bet
Memor
y
leak from t
h
e EMFModelProvider
.
cont
e
xtToR
e
sourceMappi
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
La
u
rent Goubet
Memory leaks when comparin
g
Siriu
s
diagr
a
ms
commit
|
commitdiff
|
tree
2018-03-13
lgou
b
et
Removing
the
subversive inte
g
ration pl
u
gi
n
s
commit
|
commitdiff
|
tree
2018-03-13
Laure
n
t
G
oubet
XMI files are not always models
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goubet
Memory leak during aut
o
matic merg
e
operation
s
from
.
.
.
commit
|
commitdiff
|
tree
2018-03-13
Laurent Goub
e
t
Don't return null
f
r
om IType
d
E
lement
.
getName()
.
commit
|
commitdiff
|
tree
2018-03-12
Lauren
t
G
oubet
[532
0
69] Invalid logical mod
e
l for
Synchronize with
.
.
.
commit
|
commitdiff
|
tree
2018-01-30
l
g
o
u
bet
B
u
mp plugin and fea
t
ure vers
i
ons
f
or Photon
commit
|
commitdiff
|
tree
2018-01-24
lgoubet
Removi
n
g
t
he
P
apyrus
plugins and
f
eatures from the
.
.
.
commit
|
commitdiff
|
tree
2017-10-09
La
u
rent Goubet
A
PI break in JGit 4
.
9
d
u
e to the fix for bug
5
1712
8
commit
|
commitdiff
|
tree
2017-09-08
L
a
ur
e
nt
Goubet
[5104
2
0] Adding missing extension
p
o
int
definit
i
ons
.
.
.
commit
|
commitdiff
|
tree
2017-09-07
Laure
n
t G
o
ub
e
t
[515591] Try a
n
d fix random
t
est
fai
l
ures
commit
|
commitdiff
|
tree
2017-09-07
Laurent
Goubet
per
f
ormance
p
lu
g
in issues
commit
|
commitdiff
|
tree
2017-08-31
La
u
rent Goub
e
t
[521358] doc
u
mentation
f
or EMFCompareRCPPlugi
n
m
issi
n
g
.
.
.
commit
|
commitdiff
|
tree
2017-08-23
Laure
n
t Goubet
Bumping versio
n
s for O
x
y
g
en
.
1
commit
|
commitdiff
|
tree
2017-08-23
Lau
r
e
n
t
Gou
b
et
Removing non funct
i
onal pro
f
il
e
s
f
rom pom
commit
|
commitdiff
|
tree
2017-08-22
L
aur
e
n
t Goubet
Sepa
r
ate core
& extra builds
commit
|
commitdiff
|
tree
2017-07-07
Laurent Goubet
[5186
1
2] Fr
e
quent CME from the adapter
f
a
c
tory disposal
commit
|
commitdiff
|
tree
2017-07-06
Laurent Go
u
bet
U
se the re
l
eased ver
s
io
n
of EGit
commit
|
commitdiff
|
tree
2017-06-12
L
aurent Gou
b
et
"spy"ing i
s
the
root cause of a huge memory leak
commit
|
commitdiff
|
tree
2017-06-06
L
a
ur
e
nt Gou
b
et
Rev
e
r
t "Refactorings t
o
i
m
p
rove perf
o
rma
n
c
e of MatchUtil"
commit
|
commitdiff
|
tree
2017-06-06
Laurent Goubet
Revert "Use more e
f
f
i
ci
e
nt
feature look-
u
p i
n
ReferenceUtil"
commit
|
commitdiff
|
tree
2017-05-11
La
u
r
ent
Goub
e
t
[
5
16345]
Incon
s
istency with the logical model resolution
commit
|
commitdiff
|
tree
2017-05-11
L
auren
t
Goub
e
t
Compatib
i
lity
w
ith guav
a
21
commit
|
commitdiff
|
tree
2017-05-09
Laurent Goubet
[51503
9
]
a
v
o
i
d
throwi
n
g exception
s
durin
g
resource
.
.
.
commit
|
commitdiff
|
tree
2017-04-07
Laurent Goube
t
Bump ve
r
s
ions f
o
r
EMF Compare 3
.
3
.
1
commit
|
commitdiff
|
tree
2017-04-07
Lau
r
ent Goubet
Missing
a
bout
.
html i
n
multiple
p
lugins
commit
|
commitdiff
|
tree
2017-04-07
L
a
ur
e
nt Goubet
Make sure
w
e cannot impor
t
unsupported gu
a
v
a
vers
i
ons
commit
|
commitdiff
|
tree
2017-02-10
La
u
re
n
t
Goube
t
Try and give more memo
r
y to
o
ur overly long tests
commit
|
commitdiff
|
tree
2017-01-11
Laurent Goubet
[509413
]
E
xternali
z
e strings for
"Expand
A
ll
"
and
.
.
.
commit
|
commitdiff
|
tree
2016-12-08
L
a
urent Goubet
swit
c
h neon tp to fixed
u
pdate s
i
tes
commit
|
commitdiff
|
tree
2016-11-22
La
u
rent Goubet
Use obeo's github instead of axel'
s
commit
|
commitdiff
|
tree
2016-11-21
Laurent Goubet
Use tycho 0
.
26
commit
|
commitdiff
|
tree
2016-11-03
Laure
n
t
Goubet
Don't
build the update site unle
s
s it's using t
h
e latest tp
commit
|
commitdiff
|
tree
2016-11-03
Laur
e
nt G
o
ubet
First version of an Oxygen
tp
commit
|
commitdiff
|
tree
2016-09-14
Laurent Goubet
B
u
m
p
versions for E
M
F Compare 3
.
3
.
0
Signed-off-by: Laurent Goubet <
laurent.goubet@obeo.fr
>
commit
|
commitdiff
|
tree
2016-07-15
Laurent
G
oubet
[
4
973
9
9]
tagged
v
alues tooltips throw IAEs
commit
|
commitdiff
|
tree
next