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
The navigatable's cache needs to be cleared when we refresh the viewer
2019-09-17
lgoubet
The na
v
iga
t
a
b
le's cach
e
needs to
be cleared wh
e
n
we
.
.
.
commit
|
commitdiff
|
tree
2019-09-16
l
g
o
ubet
The
M
atchEngineFacto
r
y d
o
esn't make use of its se
t
ters
commit
|
commitdiff
|
tree
2019-09-16
lgoubet
Happy checkst
y
l
e
commit
|
commitdiff
|
tree
2019-09-11
lgoubet
Update setu
p
f
i
le
commit
|
commitdiff
|
tree
2019-09-10
lgo
u
bet
Target plat
f
or
m
b
a
s
ed on
2
0
19-06
commit
|
commitdiff
|
tree
2019-09-10
l
goubet
Behavi
o
r chan
g
e in 2019-06 - Exceptions are now in
.
.
.
commit
|
commitdiff
|
tree
2019-09-09
lgoube
t
Re
m
ove th
e
3
2
bit pl
a
tf
o
rms for
o
ur target configuratio
n
s
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Index
i
ssue when merging
n
on-unique attr
i
bu
t
es'
elements
commit
|
commitdiff
|
tree
2019-09-06
lgoube
t
Diffs depending on
pseudo-conflic
t
s d
o
not reject the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoube
t
M
O
V
E
difference
s
also need
t
o ta
k
e into ac
c
ou
n
t the
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Inaccurate conf
l
i
c
t d
e
tecti
o
n
f
or moves in non-co
n
t
a
inm
e
n
t
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
l
goube
t
M
o
ves with non-u
n
ique values and addition/d
e
letions
.
.
.
commit
|
commitdiff
|
tree
2019-09-06
lgoubet
Only MOV
E
d
i
ff
s
nee
d
to be ign
o
red when computing t
h
e
LCS
commit
|
commitdiff
|
tree
2019-09-04
l
g
oubet
Conflict det
e
cti
o
n on ind
e
x
c
h
a
n
ges mu
s
t take Fe
a
tureFilte
r
.
.
.
commit
|
commitdiff
|
tree
2019-09-04
lgoubet
Make sure the UI won'
t
try to c
o
mpute the LCS fo
r
huge
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
l
g
oubet
The "accept/re
j
ect"
a
ll non
-
c
onflic
t
ing action s
h
ouldn
.
.
.
commit
|
commitdiff
|
tree
2019-08-30
lgou
b
et
F
i
x diff, conflict d
e
tec
t
ion and merging of non-unique
.
.
.
commit
|
commitdiff
|
tree
2019-08-28
lgou
b
et
Potent
i
al out
o
f bounds exception
commit
|
commitdiff
|
tree
2019-08-27
lgoube
t
Compatibility with jgit
5
.
4
.
2
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
Performan
c
e - use DiffCr
o
ss
R
efe
r
encer whe
n
possible
commit
|
commitdiff
|
tree
2019-08-22
lgoubet
regre
s
sion - right-
c
lic
k
actions on single diff selecti
o
ns
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgoubet
Open
S
MV API to allow implementers
to acces
s
the
raw
.
.
.
commit
|
commitdiff
|
tree
2019-08-06
lgo
u
bet
Pr
e
vents except
i
ons fr
o
m
being thrown from
t
h
e v
i
ewer
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lgoubet
P
e
rf
o
rma
n
c
e
- use
str
e
ams instead of guava it
e
rations
.
.
.
commit
|
commitdiff
|
tree
2019-08-05
lg
o
ub
e
t
Performa
n
ce - re
m
o
v
e
u
seless guava
transformation
commit
|
commitdiff
|
tree
2019-07-17
Christian W
.
Damus
[522080]
[
UML]
A
dd-add co
n
flicts in stereo
t
ype application
.
.
.
commit
|
commitdiff
|
tree
2019-07-17
lgo
u
bet
Fix detection of pseud
o
conf
l
i
c
ts on
single-valued
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgou
b
et
Reg
r
e
ssi
o
n on the
group/match right-
c
l
ic
k
actions
i
n
S
M
W
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Prop
e
rly describe w
h
at the
conflict resolving a
c
tions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
M
a
rtin F
l
eck
[506928]
C
om
p
arisonScopeEditorInput d
o
es not respe
c
t
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
lgoub
e
t
Ad
d
StructureMergeViewer
custom
i
zation o
p
tions
commit
|
commitdiff
|
tree
2019-07-16
lgoubet
Shortcut t
h
e UMLPost
P
rocessor's s
u
bs
e
t
imp
l
ica
t
ions
.
.
.
commit
|
commitdiff
|
tree
2019-07-16
A
xel Richar
d
Act
i
v
a
tion of
a
ll Git tests
commit
|
commitdiff
|
tree
2019-07-16
l
goubet
Prevent NPE from o
v
err
i
de
n
Resource implementations
commit
|
commitdiff
|
tree
2019-07-16
l
g
oube
t
I
gn
o
re
"o
r
igi
n
alTargetObjects" from
t
he EMF
C
ompar
e
.
.
.
commit
|
commitdiff
|
tree
2019-07-10
lgo
u
be
t
Bump versi
o
n
s to 3
.
3
.
8
commit
|
commitdiff
|
tree
2019-07-04
lgou
b
et
Adapt tests t
o
E
G
it ch
a
nge of beha
v
ior
commit
|
commitdiff
|
tree
2019-05-29
l
g
oubet
Enable users to mer
g
e all conflict
s
at once through
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Merging sing
l
e-valued cont
a
inment changes c
a
n lead
.
.
.
commit
|
commitdiff
|
tree
2019-05-23
lgou
b
e
t
Typos
commit
|
commitdiff
|
tree
2019-05-23
lgoubet
Prevent
L
CS computation wh
e
n we do not
need or
d
ering
.
.
.
commit
|
commitdiff
|
tree
2019-04-25
lgoube
t
Prev
e
nt duplicate insertion poin
t
s to
be shown in tree
.
.
.
commit
|
commitdiff
|
tree
2019-04-22
lgoube
t
P
re
v
ent CMV
d
isposal wh
e
n
user sel
e
cts multiple elements
.
.
.
commit
|
commitdiff
|
tree
2019-04-18
lgoubet
O
nly add new adapte
r
s when needed
commit
|
commitdiff
|
tree
2019-04-14
l
g
o
ubet
It
e
rate
over the
d
ifference
s
instead of t
h
e matches
commit
|
commitdiff
|
tree
2019-04-09
lgoubet
Preven
t
OutOfMemoryErrors from
t
h
e
UI
w
hen s
w
itch
i
n
g CMV
commit
|
commitdiff
|
tree
2019-04-08
lgoubet
Per
f
ormance - C
o
mputing requi
r
e
ments
t
i
m
e
s
commit
|
commitdiff
|
tree
2019-04-08
l
g
oub
e
t
The UM
L
t
e
s
ts shouldn't use a
cache
d
instance of
E
MFCompare
commit
|
commitdiff
|
tree
2019-04-03
l
g
oubet
R
e
store
p
ossibility to remov
e
me
r
gers from
t
h
e
r
egis
t
ry
commit
|
commitdiff
|
tree
2019-03-22
lgoubet
Make sure we hook
t
he UI when users provide a precom
p
ute
d
.
.
.
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
B
u
mp E
M
F
Compar
e
to 3
.
3
.
7 in pre
p
a
r
at
i
o
n
f
o
r
20
1
9-06
commit
|
commitdiff
|
tree
2019-03-21
lgoubet
Disposing of the
c
omparison shoul
d
n't
b
e done by the SMV
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
B
u
m
p versio
n
s for 3
.
3
.
6 for
2
0
1
9
-
03
commit
|
commitdiff
|
tree
2019-02-26
lgo
u
bet
patch ModelGi
t
MergeEditorInput for EG
i
t
5
.
3
.
0 compatibili
t
y
commit
|
commitdiff
|
tree
2019-02-26
lgoubet
Suppress guava
n
ested conca
t
enations
commit
|
commitdiff
|
tree
2019-02-11
lg
o
u
b
et
Rem
o
v
e
a
ccidental
use o
f
Guava
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
SWTException
w
hen switching compariso
n
s
i
n
a
c
ompare
.
.
.
commit
|
commitdiff
|
tree
2019-02-11
lgoubet
Allow c
l
i
e
nts to provide pre
-
c
o
mputed compa
r
isons to
.
.
.
commit
|
commitdiff
|
tree
2018-12-04
lgoubet
Ignore fail
i
ng
g
it
t
e
sts
f
or now
commit
|
commitdiff
|
tree
2018-12-03
lgo
u
b
e
t
Bump versions to 3
.
3
.
5
commit
|
commitdiff
|
tree
2018-12-03
l
goube
t
Use a
released
v
ersion
of Sirius
commit
|
commitdiff
|
tree
2018-11-30
lgo
u
bet
[
5
41730] Revert
s
d59c924
d
u
e t
o
an UI
freeze
commit
|
commitdiff
|
tree
2018-06-22
lgou
b
et
bump feat
u
re versions
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
bum
p
ve
r
sions
commit
|
commitdiff
|
tree
2018-06-22
Stéphan
e
Thib
a
udeau
Exten
s
io
n
p
oint to p
r
o
vide specific matching
r
ules
.
.
.
commit
|
commitdiff
|
tree
2018-06-22
S
té
p
h
a
ne
T
h
i
baudeau
EMF Compare is co
m
patible with JGit 5
.
* ve
r
s
ions
commit
|
commitdiff
|
tree
2018-06-22
Sté
p
hane Thib
a
udeau
Add explicit de
p
ende
n
cy to org
.
eclipse
.
g
e
f
commit
|
commitdiff
|
tree
2018-06-22
Stépha
n
e Thibaudeau
Do
n
ot minimize identical re
s
ources when Xtext is used
commit
|
commitdiff
|
tree
2018-06-22
Stéphane T
h
ibaudeau
Use white-list
s
tra
t
e
gy to retrieve the Mod
e
l provider
commit
|
commitdiff
|
tree
2018-06-22
Stéphane Thibau
d
eau
B
e
tter
han
d
l
i
ng of
Xtext w
i
t
h
L
ive
s
cope opt
i
on
commit
|
commitdiff
|
tree
2018-06-22
lgoubet
EMF Compare
i
s no
l
onger co
m
patibl
e
with e
g
i
t < 4
.
2
commit
|
commitdiff
|
tree
2018-06-05
lg
o
ubet
Introduce test for merg
e
s
with mult
i
ple ance
s
tors
commit
|
commitdiff
|
tree
2018-05-03
Philip Langer
Impro
v
e
p
e
rformance of
D
iffUt
i
l
commit
|
commitdiff
|
tree
2018-05-03
P
h
ilip Lang
e
r
Improve performance of Compari
s
ionUtil
commit
|
commitdiff
|
tree
2018-05-03
Philip Langer
Improve perf
o
rman
c
e of equality helper
commit
|
commitdiff
|
tree
2018-03-16
Laurent Goubet
Allow pr
o
xy res
o
lution from the EMF Compare content
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent
G
oubet
Allow proxy
resoluti
o
n from the EMF
C
o
mpare
s
tru
c
ture
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laur
e
nt Goubet
SMV action to revea
l
al
l
differ
e
n
c
es i
n
co
n
flict with
.
.
.
commit
|
commitdiff
|
tree
2018-03-16
Laurent Gou
b
e
t
Add actions to merge ev
e
rything to
"
get ri
g
ht" or
.
.
.
commit
|
commitdiff
|
tree
2018-02-05
Christi
a
n
W
.
Damus
[522064] Profi
l
e
-ap
p
l
i
cation
version
c
heck too restrictive
.
.
.
commit
|
commitdiff
|
tree
2018-01-30
lgo
u
bet
Bump plugin and featur
e
versions fo
r
Pho
t
o
n
commit
|
commitdiff
|
tree
2018-01-24
lgou
b
et
Removing
t
he
P
a
py
r
us
pl
u
gins and f
e
atu
r
es from the
.
.
.
commit
|
commitdiff
|
tree
2013-01-18
lgoubet
[367475
]
Take
g
i
t
s
peci
f
icities into acc
o
unt
when resolving
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
l
g
oubet
Ren
a
ming R
e
sourceTraversal into Stora
g
eTraversal to
commit
|
commitdiff
|
tree
2012-10-31
lgoubet
Disp
l
a
y
a proper nam
e
for
t
he
references when the
d
iff
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
lgoub
e
t
i
nformation returne
d
i
f th
e
lo
g
ical
mo
d
el resolut
i
on
.
.
.
commit
|
commitdiff
|
tree
2012-10-31
l
g
oubet
Us
e
the same ell
i
sion
for A
t
tribute and
r
eference
labels
commit
|
commitdiff
|
tree
2012-10-31
l
g
oubet
Pr
o
perly display
d
ifference that are not direct
l
y r
e
fined
commit
|
commitdiff
|
tree
2012-10-22
l
g
o
ubet
Prevent mergi
n
g
to
w
ards the git in
d
e
x (or o
t
her remote
.
.
.
commit
|
commitdiff
|
tree
2012-10-22
lg
o
ubet
Lower the nu
m
ber
o
f threads
:
our bottleneck
i
s t
h
e
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
l
goube
t
When r
e
structuri
n
g the match model
commit
|
commitdiff
|
tree
2012-10-19
l
goubet
This has
n
othing
to
d
o
a
s package
v
i
s
ible
commit
|
commitdiff
|
tree
2012-10-19
l
g
o
u
bet
Make ResourceTraversal,
R
esourceUtil and Sto
r
age
U
RIConver
t
er
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
Lo
a
d
t
he ri
g
ht v
e
rsions
o
f the distant files
.
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
T
he
UI should use
pos
t
process
o
rs
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
avoid
do
u
ble scheme
.
.
.
commit
|
commitdiff
|
tree
2012-10-19
lgoubet
Alwa
y
s
prevent
l
o
ad : ecore tends to
load ne
w
resources
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
lg
o
ubet
Leav
e
the pos
s
ibility fo
r
sub-classe to not have a
.
.
.
commit
|
commitdiff
|
tree
2012-10-15
lg
o
ubet
Su
p
pressing un
a
voi
d
able w
a
rning
commit
|
commitdiff
|
tree
2012-10-15
lgoubet
Commenting, and
r
educ
i
n
g the nesting count of getDELOr
i
g
i
nVa
.
.
.
commit
|
commitdiff
|
tree
next