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
Potential NPE with some implementations of the property sheet pages
2019-09-19
lgoub
e
t
Potent
i
al
N
PE with
s
ome implementations of the proper
t
y
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
Some impleme
n
tations of Resource
.
Dia
g
nostic ma
y
r
e
turn
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgoubet
EMF
C
ompare
does not suppo
r
t relative xsi:
s
c
h
ema
L
oca
t
i
o
n
.
.
.
commit
|
commitdiff
|
tree
2019-09-19
lgo
u
bet
A
P
I
c
o
mpatibility
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Remove p
a
r
t
of guava uses
commit
|
commitdiff
|
tree
2019-09-18
l
goubet
Bump to 3
.
3
.
9
commit
|
commitdiff
|
tree
2019-09-18
lg
o
ubet
Open
t
h
e compare na
v
igatable a
s
inter
n
al API
commit
|
commitdiff
|
tree
2019-09-18
lgoubet
Regi
s
ter the n
a
vigatable so tha
t
the toolbar action
s
.
.
.
commit
|
commitdiff
|
tree
2019-09-17
lgou
b
et
The navigatable's cache
n
e
e
ds to be cleared
w
hen we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
T
h
e MatchEngineFactory doesn't
m
ake use of its setters
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
H
a
ppy ch
e
ckstyl
e
commit
|
commitdiff
|
tree
2019-09-11
l
g
oubet
U
p
date setup
f
ile
commit
|
commitdiff
|
tree
2019-09-10
l
g
oubet
T
arget platform based on 2019
-
06
commit
|
commitdiff
|
tree
2019-09-10
lgoubet
B
e
havior cha
n
ge in 2019-06 - E
x
ce
p
t
i
ons are
no
w
in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoubet
Remove
t
h
e 32 bit platforms
for o
u
r target
c
onfigurations
commit
|
commitdiff
|
tree
2019-09-06
lgoub
e
t
I
ndex
issue when merging no
n
-uniqu
e
att
r
ibutes' ele
m
ents
commit
|
commitdiff
|
tree
2019-09-06
lgo
u
bet
Diffs
d
epen
d
ing
o
n pseudo-co
n
flicts do not rej
e
c
t the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoube
t
MOVE diff
e
rences also need to
t
ake into
a
ccount the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Inaccurate co
n
flict detection for mov
e
s
i
n non-containment
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Mo
v
es
w
ith no
n
-
u
nique values and ad
d
itio
n
/deletio
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Only MOVE di
f
f
s
ne
e
d to
b
e ignored when computin
g
the LCS
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
C
o
nflict de
t
ec
t
io
n
on index chan
g
es m
u
st tak
e
FeatureFilter
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Make sure the UI won't try to c
o
m
p
ute
the L
C
S for
huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgoubet
The "accept
/
reject
"
all non
-
conflicting action shouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
l
goubet
F
i
x diff,
c
onflict d
e
t
e
c
t
i
o
n and me
r
ging of non-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgoube
t
Potential ou
t
of bou
n
d
s
ex
c
e
p
tion
commit
|
commitdiff
|
tree
2019-08-27
lgoubet
Compat
i
bilit
y
w
ith j
g
it 5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lg
o
ubet
P
e
rforman
c
e
- use Dif
f
Cr
o
ssR
e
ference
r
w
h
e
n
possible
commit
|
commitdiff
|
tree
2019-08-22
lg
o
ubet
reg
r
ession -
r
ight-click actions on single diff sele
c
tions
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoub
e
t
O
p
en SMV
A
PI
to allow imp
l
ementers to access
t
he r
a
w
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Pr
e
vent
s
exceptions from bein
g
thrown fr
o
m the
v
iewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoube
t
Perfor
m
ance -
u
se streams in
s
t
ead
o
f gua
v
a
i
t
e
rations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
l
goubet
Performan
c
e - remove useles
s
guava t
r
ans
f
ormation
commit
|
commitdiff
|
tree
2019-07-17
Christian W
.
Da
m
us
[
5
22080] [
U
ML
]
Add-
a
d
d
conflicts in stereotype appli
c
ation
.
.
.
commit
|
commitdiff
|
tree
2019-07-17
lg
o
u
b
e
t
Fix detect
i
on
of
pseudo conflicts
o
n
single-valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Regressio
n
on th
e
group/match right-click actio
n
s i
n
SMW
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
e
t
Properly describe what the conflic
t
res
o
lv
i
n
g
actio
n
s
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Martin Fle
c
k
[506928
]
Compar
i
sonScope
E
ditorInput
d
oes not respe
c
t
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
S
t
efan Di
r
ix
C
a
ncel Fa
s
ter in
Proxim
i
t
yEObjectMatc
h
er
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Add Structu
r
eMergeViewer customization
o
ptions
commit
|
commitdiff
|
tree
2019-07-16
lgo
u
bet
Sh
o
rtcut the
U
M
L
PostProces
s
or's subset imp
l
ications
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
Axel Rich
a
r
d
Act
i
vation
o
f all
G
it tests
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Prevent NPE from overriden Resourc
e
implementations
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
et
Ignor
e
"originalTargetObjects" from th
e
EMF Compare
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgoubet
Bump versio
n
s
to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
Willi
a
m
P
i
e
rs
Enabled "accept change" act
i
o
n
on
m
ultiple d
i
ff selection
commit
|
commitdiff
|
tree
2019-07-04
l
g
oubet
Adapt
tests
t
o EGit change o
f
behav
i
or
commit
|
commitdiff
|
tree
2019-05-29
lgoub
e
t
Enable users to me
r
g
e
al
l
conflicts at once through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoube
t
Merging singl
e
-valued containmen
t
changes
c
a
n
lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
l
g
oubet
Typo
s
commit
|
commitdiff
|
tree
2019-05-23
lgoub
e
t
Prevent LCS
c
omputation when we d
o
not nee
d
ordering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoube
t
Prevent duplicate insertion
p
oints to be show
n
i
n
tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgou
b
et
P
r
e
v
en
t
CMV di
s
pos
a
l when
u
s
e
r sel
e
c
t
s multiple elements
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
O
nly add
n
ew
a
da
p
ters when need
e
d
commit
|
commitdiff
|
tree
2019-04-14
lgoube
t
I
ter
a
te over the differences ins
t
ead of the matches
commit
|
commitdiff
|
tree
2019-04-09
lgo
u
bet
P
re
v
ent OutO
f
Memory
E
r
rors fr
o
m
the UI when swit
c
hing CMV
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
Performance - Computing requirements times
commit
|
commitdiff
|
tree
2019-04-08
l
g
oubet
T
he
U
ML test
s
shouldn'
t
use a ca
c
hed instance
o
f EMFCompare
commit
|
commitdiff
|
tree
2019-04-03
lg
o
u
bet
Resto
r
e
possi
b
i
l
i
t
y
to r
e
move m
e
rgers
f
rom the registry
commit
|
commitdiff
|
tree
2019-04-01
W
i
l
liam
Piers
Fixed ArrayOutOfBo
u
nds in case
of empty lists
commit
|
commitdiff
|
tree
2019-03-22
l
g
oubet
Make sure we ho
o
k the UI when users pro
v
ide a precomputed
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Bump
E
MF Compa
r
e t
o
3
.
3
.
7 in preparatio
n
for 2019-06
commit
|
commitdiff
|
tree
2019-03-21
lgoub
e
t
Dis
p
o
s
i
ng of the comparison
shouldn't be do
n
e
b
y the SMV
commit
|
commitdiff
|
tree
2019-03-04
lgoubet
Avoid ClassCastExcepti
o
n when
m
erging feature ma
p
changes
commit
|
commitdiff
|
tree
2019-02-26
l
g
oubet
Bump
v
ersions for 3
.
3
.
6 for 2019-0
3
commit
|
commitdiff
|
tree
2019-02-26
lgou
b
et
patch
M
ode
l
GitM
e
rgeEditorInput for
EGi
t
5
.
3
.
0 compatibility
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Supp
r
ess
g
uava nested concatena
t
ions
commit
|
commitdiff
|
tree
2019-02-11
lgo
u
bet
R
e
m
o
ve a
c
cide
n
tal use of Guava
commit
|
commitdiff
|
tree
2019-02-11
lgo
u
bet
SWTException
w
hen switching comparis
o
ns
i
n a co
m
pare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Allow
c
lien
t
s
t
o
provide pre-c
o
mputed c
o
mparis
o
ns to
.
.
.
commit
|
commitdiff
|
tree
2018-12-11
Philip La
n
ger
[527567] Provide support for a general propert
y
merge
.
.
.
commit
|
commitdiff
|
tree
2018-12-11
Philip La
n
ger
[514079] Imp
r
o
v
e
mirr
o
ri
n
g support
commit
|
commitdiff
|
tree
2018-12-04
lgoubet
I
g
n
ore faili
n
g git tests for now
commit
|
commitdiff
|
tree
2018-12-03
lgoub
e
t
Bump
versi
o
ns t
o
3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
lgoubet
Use
a
releas
e
d
version of
S
irius
commit
|
commitdiff
|
tree
2018-11-30
lgoubet
[54
1
730] Reverts d59c924 du
e
to an UI freez
e
commit
|
commitdiff
|
tree
2018-06-22
lgoub
e
t
bum
p
feature
versions
commit
|
commitdiff
|
tree
2018-06-22
l
gou
b
et
bump version
s
commit
|
commitdiff
|
tree
2018-06-22
Stéphane T
h
ibau
d
eau
Ext
e
n
s
ion point to provid
e
s
p
ecific ma
t
ching
r
ules
.
.
.
commit
|
commitdiff
|
tree
2018-06-22
St
é
phane Thibaudeau
Remove
useless an
d
mysterious
code
commit
|
commitdiff
|
tree
2018-06-22
St
é
phan
e
T
h
iba
u
deau
EMF Compare is com
p
a
tible with JGit
5
.
* vers
i
on
s
commit
|
commitdiff
|
tree
2018-06-22
Stéphane
Thib
a
u
d
eau
Add
explicit dependency to
o
r
g
.
eclipse
.
gef
commit
|
commitdiff
|
tree
2018-06-22
Stéph
a
n
e Thibaudeau
Do
not min
i
mi
z
e identica
l
resources when Xtext is
u
sed
commit
|
commitdiff
|
tree
2018-06-22
Stép
h
ane Thibaud
e
au
Use whi
t
e-list strat
e
gy to retrieve the Model prov
i
der
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Thibaudeau
B
etter handling of Xtext wit
h
Live scope option
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
EMF Compare is no
l
onger compatible
with egit
<
4
.
2
commit
|
commitdiff
|
tree
2018-06-05
l
goubet
I
n
tro
d
uce
test
for merges
wit
h
mu
l
tiple ancestor
s
commit
|
commitdiff
|
tree
2018-06-04
Arthu
r
Da
u
s
s
y
[534365] F
i
x Re
c
u
r
siv
e
ModelMer
g
er
f
or "binary"
git
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
A
r
thur Dau
s
sy
Do not h
a
n
dle
"
merg
e
d
"
files twice when JGit s
t
a
g
e
s
.
.
.
commit
|
commitdiff
|
tree
2018-06-04
Arth
u
r
D
aussy
[535200] Cr
e
ate a new
TreeWalk in
s
t
ead
r
eusi
n
g one
commit
|
commitdiff
|
tree
2018-05-03
P
hilip Langer
Improv
e
performance of DiffUtil
commit
|
commitdiff
|
tree
2018-05-03
P
h
ilip Langer
Improve performance of
C
omp
a
risionUtil
commit
|
commitdiff
|
tree
2018-05-03
Philip Lange
r
I
m
p
rove perfor
m
ance
of eq
u
ality
helper
commit
|
commitdiff
|
tree
2018-05-01
C
h
r
istian W
.
Damus
[
5
25473] [Papyrus] Con
n
ections disappear when com
p
ari
n
g
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
P
h
ilip
L
anger
Av
o
id vi
s
iting
e
lement
s
mu
l
tiple times
in Graph
.
ParentsIterator
commit
|
commitdiff
|
tree
2018-05-01
Christ
i
a
n
W
.
Damus
[5
2
5286]
[Papyrus] D
i
f
fs in
inv
i
sibl
e
st
e
r
eotype
p
r
op
e
rty
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Philip La
n
g
er
[52194
0
]
P
rev
e
nt index out of
bounds exception
o
n e
m
p
t
y
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
P
hili
p
Langer
SWT
U
ti
l
.
s
afeR
e
draw
should
c
hec
k
for d
i
s
p
osed control
commit
|
commitdiff
|
tree
2018-05-01
Philip Lan
g
er
[527567] Generalize t
h
e table and tree
m
erge
viewer
.
.
.
commit
|
commitdiff
|
tree
2018-05-01
Ca
m
ille Leta
v
ernier
[529882] S
y
nchronize z
o
om levels
a
nd a
l
low
c
h
anging
.
.
.
commit
|
commitdiff
|
tree
next